(#20863) removes host file generation from --preserve-hosts option
(maint) add new cfg for PuppetDB perf testing
Merge branch 'master' of github.com:puppetlabs/puppet-acceptance
Merge pull request #458 from anodelman/remove-preserve-hosts-file

(#20863) removes host file generation from --preserve-hosts option
Annotate vcloud VMs
Base template, creation time, and link to CI build
Syntax/verbiage changes
Merge pull request #460 from puppetlabs/annotation_and_syntax

Annotation and syntax
Merge branch 'master' into ntpdate-lib