Revert "Revert "Merge pull request #451 from underscorgan/maint/master/1.7.0-prep""
Revert "Revert "Merge pull request #451 from underscorgan/maint/master/1.7.0-prep""

This reverts commit 1299123048ad87b5191167c5982f5a11f7f60127.

puppetlabs/ezbake,puppetlabs/ezbake,puppetlabs/ezbake