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

Auto-merge for build 90

See merge request puppet/puppet_cd!86

templates/puppet.conf.erb

@@ -50,7 +50,7 @@
   storeconfigs            = false
   <% end -%>
     <% if @pt_use_puppetdb == true -%>
-  storeconfigs            = true
+storeconfigs            = true
   storeconfigs_backend    = <%= @pt_storeconfigs_backend %>
 <% end end -%>
 <% if @fqdn != @pt_pm_fqdn  -%>