Squashed 'puppet/modules/gerrit/' content from commit f6dfb96

git-subtree-dir: puppet/modules/gerrit
git-subtree-split: f6dfb969e29144c5f2c0b8b0654ecc4e8dae448e
Merge commit 'f58c5e068bf809c48ccab5a3070f015f3eafc4d2' as 'puppet/modules/gerrit'
Squashed 'puppet/modules/apache/' content from commit 3c3b20c

git-subtree-dir: puppet/modules/apache
git-subtree-split: 3c3b20c8a9b8c9ef796edc0636376f3de34a1278
Merge commit 'e8b5e74403208710cb2a55f339f9f8df0a18f060' as 'puppet/modules/apache'
Squashed 'puppet/modules/mysql/' content from commit efb7a6e

git-subtree-dir: puppet/modules/mysql
git-subtree-split: efb7a6ee907507aaf840df673485fede1132c2e9
Merge commit '7f651102b06093cf5d4740de1f7e4a0373b9adc0' as 'puppet/modules/mysql'
Squashed 'puppet/modules/concat/' content from commit 031bf26

git-subtree-dir: puppet/modules/concat
git-subtree-split: 031bf261289dcbb32e63b053ed5b3a82117698c0
Merge commit '081ff43f408d4ce31bbdf4466ebb42793ef0e768' as 'puppet/modules/concat'
Squashed 'puppet/modules/jenkins/' changes from 73451d2..95f32be

95f32be Remove jenkins::plugin::install.  Update test.
f750817 Merge branch 'master' of github.com:jenkinsci/puppet-jenkins
4c7990f Merge pull request #1 from thomasbiddle/jenkins_config_fix
829cf25 Fixing Test (They were all due to linter erroring out on trailing whitespace)
ae0903b Fixing two issues in jenkins::config
b03598d fixed slave.pp
49b0e05 Merge branch 'master' of github.com:rtyler/puppet-jenkins into rtyler-master
c6a9d00 Merge of autoslave
587c1e7 Merge branch 'master' of github.com:matthewbarr/puppet-jenkins
9c968c9 fix for slave not running under puppet
1918461 Merge pull request #5 from rtyler/master
e857207 Merge pull request #4 from matthewbarr/autoslave

git-subtree-dir: puppet/modules/jenkins
git-subtree-split: 95f32be02f793d6414e4569bbd05f0f682d2ea5c
Merge commit 'f963cb0fbab3c31755cebd0c5838c22a22963efb'
(#21262) Removed nonexisting parameter from comment

$template can't be found in vhost.pp