Merge branch 'jenkins-build-88' into 'master'

Auto-merge for build 88

See merge request puppet/puppet_cd!84

templates/puppet.conf.erb

@@ -47,11 +47,11 @@
     strict_variables        = <%= @pt_strict_variables %>
     vardir                  = <%= @pt_vardir_master %>
   <% if @pt_use_puppetdb != true -%>
-    storeconfigs            = false
+  storeconfigs            = false
   <% end -%>
     <% if @pt_use_puppetdb == true -%>
-    storeconfigs            = true
-    storeconfigs_backend    = <%= @pt_storeconfigs_backend %>
+  storeconfigs            = true
+  storeconfigs_backend    = <%= @pt_storeconfigs_backend %>
 <% end end -%>
 <% if @fqdn != @pt_pm_fqdn  -%>
 [agent]