Merge branch 'master' of

https://hakcosar1@git.pixelpark.com/puppet/hiera.git

Conflicts:
	customer/cosar-test-customer/test-aem-siemens.pixelpark.net.yaml

diff --cc customer/cosar-test-customer/test-aem-siemens.pixelpark.net.yaml
index 304f837f3ce809e5a50bf88d5f0d126abeb77fdf,9e71a841bf09035dd8169818697937d0f7aa9046..5ef3c3c835954021d690d59435d32b8077a1e572
--- 1/customer/cosar-test-customer/test-aem-siemens.pixelpark.net.yaml
--- 2/customer/cosar-test-customer/test-aem-siemens.pixelpark.net.yaml
+++ b/customer/cosar-test-customer/test-aem-siemens.pixelpark.net.yaml
@@@ -9,21 -9,25 +9,23 @@@ infra::additional_classes
  
  siemens_puppet_general::java::filename: 'jre-8u131-linux-x64.rpm'
  
+ aem::base_dir: '/opt/aem6/author_siemens_com
+ 
  # Author
 -infra::profile::aem::author::license_download_id: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAmRHmcNKDMnSyGxdcJmXgNzN2rKs3o0beFw2ngSBG5JiDFXwm3o8qiYppdy9m+G7tJ75jycJp7uXoN6ejCjXLQhwIZp3+4MjferW6Sik/ib95aw4EsRwE5qbz7Vh3/oKC+RvV09WHlTSuOGxUNktdsS/zTADOBexAmBPljSV3fXX1yPu9H2kjYtZ34JcZIkO8Hmqug5fNWGZo+UsUcViS7jh5K2ZuQ1MiRGMRE4w1Y9ffbF040OF+AI/9kTvfc8vBUggvj1sLgwyoE5IMm0qtvHPUQIqWrrkY5F9sjAMrCpEyxa1ghTQg1XGEcY5OBjDmxA85Gp7feTvvaTkj3AUwWzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDyp1RYBpGRDCBY2ft02xsugBCNhPPi5f7aGGdiSIebuFC3]
 -infra::profile::aem::author::license_product_version: '5.6.1.20130606'
 -infra::profile::aem::author::license_customer_name: 'SIEMENS AG'
 -infra::profile::aem::author::license_product_name: 'Adobe Experience Manager'
 -infra::profile::aem::author::admin_pass: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAmVzQFFEiOzLFhJDceTBPKdbOzup7PfFlZB0onfQsMCphCwjbGpojA5gk2EcE4avCA14TtyEUxAz+JlU64DhxOiZOrzTy/I9oxXKOkyICnrqEzWcfyaSS4V5goDt1Mw3UhKT7jXxnNrbttMw7w4nGc73D/5Ic6XyWpCQeweQLn90JwF2HUCSUjQkkibLeE+r1bP2FJ8SzK3cdaaMiKRffUyMqtpw7OOb8b3PwiNKhLcjOvo1vVTyF86OBgQp//tzMXksbmfWDmUJyBZpPAnV1uEbgzUc+XNp7mC1dk70Tw0Qnn0g7VTJLUTOCAlql3l8IiggKIyNmQWSs/hcX0KHQLDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCAqq9LK3rNcXns3UXHd29GgBD6GcBlNkkvuR48IZaZe5Ee]
 -infra::profile::aem::author::oak_version: 1.2.18
 -
 -#aem::author::install_packages:
 -infra::profile::aem::author::instance_name: author
 -infra::profile::aem::author::install_mode: 'quickstart'
 -infra::profile::aem::author::install_options:
 +aem::base_dir: '/opt/aem6/author_siemens_com
 +aem::author::license_download_id: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAmRHmcNKDMnSyGxdcJmXgNzN2rKs3o0beFw2ngSBG5JiDFXwm3o8qiYppdy9m+G7tJ75jycJp7uXoN6ejCjXLQhwIZp3+4MjferW6Sik/ib95aw4EsRwE5qbz7Vh3/oKC+RvV09WHlTSuOGxUNktdsS/zTADOBexAmBPljSV3fXX1yPu9H2kjYtZ34JcZIkO8Hmqug5fNWGZo+UsUcViS7jh5K2ZuQ1MiRGMRE4w1Y9ffbF040OF+AI/9kTvfc8vBUggvj1sLgwyoE5IMm0qtvHPUQIqWrrkY5F9sjAMrCpEyxa1ghTQg1XGEcY5OBjDmxA85Gp7feTvvaTkj3AUwWzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDyp1RYBpGRDCBY2ft02xsugBCNhPPi5f7aGGdiSIebuFC3]
 +aem::author::license_product_version: '5.6.1.20130606'
 +aem::author::license_customer_name: 'SIEMENS AG'
 +aem::author::license_product_name: 'Adobe Experience Manager'
 +aem::author::admin_pass: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAmVzQFFEiOzLFhJDceTBPKdbOzup7PfFlZB0onfQsMCphCwjbGpojA5gk2EcE4avCA14TtyEUxAz+JlU64DhxOiZOrzTy/I9oxXKOkyICnrqEzWcfyaSS4V5goDt1Mw3UhKT7jXxnNrbttMw7w4nGc73D/5Ic6XyWpCQeweQLn90JwF2HUCSUjQkkibLeE+r1bP2FJ8SzK3cdaaMiKRffUyMqtpw7OOb8b3PwiNKhLcjOvo1vVTyF86OBgQp//tzMXksbmfWDmUJyBZpPAnV1uEbgzUc+XNp7mC1dk70Tw0Qnn0g7VTJLUTOCAlql3l8IiggKIyNmQWSs/hcX0KHQLDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCAqq9LK3rNcXns3UXHd29GgBD6GcBlNkkvuR48IZaZe5Ee]
 +aem::author::oak_version: 1.2.18
 +aem::author::jvm_opts: '-d64 -Djavax.net.ssl.trustStore=/etc/pki/java/cacerts -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -XX:SurvivorRatio=20 -XX:TargetSurvivorRatio=0 -XX:MaxTenuringThreshold=8 -XX:+UseParNewGC -XX:ParallelGCThreads=4 -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+CMSCompactWhenClearAllSoftRefs -XX:CMSInitiatingOccupancyFraction=85 -XX:+CMSScavengeBeforeRemark -XX:+UseCompressedOops -XX:+DisableExplicitGC -Doak.queryLimitInMemory=500000 -Doak.queryLimitReads=100000 -Doak.fastQuerySize=true'
 +aem::author::install_options:
    download_type: maven
    download_uri: com.adobe.aem:aem-quickstart:6.2:jar
 +aem::author::install_mode: 'quickstart'  
  
 -infra::profile::aem::author::jvm_opts: '-d64 -Djavax.net.ssl.trustStore=/etc/pki/java/cacerts -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -XX:SurvivorRatio=20 -XX:TargetSurvivorRatio=0 -XX:MaxTenuringThreshold=8 -XX:+UseParNewGC -XX:ParallelGCThreads=4 -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+CMSCompactWhenClearAllSoftRefs -XX:CMSInitiatingOccupancyFraction=85 -XX:+CMSScavengeBeforeRemark -XX:+UseCompressedOops -XX:+DisableExplicitGC -Doak.queryLimitInMemory=500000 -Doak.queryLimitReads=100000 -Doak.fastQuerySize=true'  
 -infra::profile::aem::author::oak_version: 1.2.18
 +infra::profile::aem::author::instance_name: author  
  infra::profile::aem::author::install_files:
    org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.cfg:
      content: |