So in CI, we pin puppet-acceptance to revision 65b8f5c, not sure why - I presume it was done for stability. Here, you are grabbing from master instead. How much is this going to break things ... do we need to unpin CI, and make sure community still works etc. Some changes further down in this diff seem like breaking changes. I presume you guys are all thinking about this ... we don't want to go merging this under the presumption it 'works for pe' to find it breaks the public tests somehow.