Bring in Jonathan Stoppani's branch

Merge SMAC:feature/master/7286 into current puppetlabs:master