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

Auto-merge for build 92

See merge request puppet/puppet_cd!88

templates/puppet.conf.erb

@@ -49,9 +49,9 @@
   <% if @pt_use_puppetdb != true -%>
   storeconfigs            = false
   <% end -%>
-    <% if @pt_use_puppetdb == true -%>
-storeconfigs            = true
-  storeconfigs_backend    = <%= @pt_storeconfigs_backend %>
+  <% if @pt_use_puppetdb == true -%>
+  storeconfigs            = true
+    storeconfigs_backend    = <%= @pt_storeconfigs_backend %>
 <% end end -%>
 <% if @fqdn != @pt_pm_fqdn  -%>
 [agent]