Updating for release 2.3
Merge branch 'master' of github.com:puppetlabs/puppetlabs-training-bootstrap
Updating for release 2.4