Remove unnecessary macros (#3632)

* Simplify macros in assembly
* Drop unnecessary ifdef macro
  This file is not used by Satellite.
  Satellite also does not support Debian-installer which did not use any
  "ifdef" macro before. Now, it's consistent.

(cherry picked from commit 545c779)

guides/common/assembly_supported-usage-and-versions-of-project-components.adoc

@@ -2,18 +2,14 @@ include::modules/con_supported-usage-and-versions-of-project-components.adoc[]
 
 ifdef::satellite[]
 include::modules/con_supported-usage-of-project-components.adoc[leveloffset=+1]
-endif::[]
 
-ifdef::satellite[]
 include::modules/con_supported-client-architectures-for-content-management.adoc[leveloffset=+1]
-endif::[]
 
-ifdef::satellite[]
 include::modules/con_supported-client-architectures-for-host-provisioning.adoc[leveloffset=+1]
-endif::[]
 
-ifdef::satellite[]
 include::modules/con_supported-client-architectures-for-configuration-management.adoc[leveloffset=+1]
+
+include::modules/con_supported-usage-and-versions-of-project-components-additional-resources.adoc[leveloffset=+1]
 endif::[]
 
 ifndef::satellite,orcharhino[]
@@ -23,7 +19,3 @@ endif::[]
 ifndef::satellite[]
 include::modules/con_client-operating-systems.adoc[leveloffset=+1]
 endif::[]
-
-ifdef::satellite[]
-include::modules/con_supported-usage-and-versions-of-project-components-additional-resources.adoc[leveloffset=+1]
-endif::[]

guides/common/modules/con_client-operating-systems.adoc

@@ -11,9 +11,7 @@ include::snip_supported-client-operating-systems.adoc[]
 * OpenSCAP
 * OpenSSH
 * Puppet
-ifndef::satellite[]
 * Salt
-endif::[]
 * Windows Remote Management (WinRM)
 * Operating system installers that can perform unattended installations, such as Anaconda or Debian-installer