[Merge] ~nacc/ubuntu/+source/puppet:merge into ~ubuntu-server-dev/ubuntu/+source/puppet:ubuntu/devel

[Robie Basak]

This one got done also I think?
-- 
https://code.launchpad.net/~nacc/ubuntu/+source/puppet/+git/puppet/+merge/288424
Your team Ubuntu Server Developers is requested to review the proposed merge of ~nacc/ubuntu/+source/puppet:merge into ~ubuntu-server-dev/ubuntu/+source/puppet:ubuntu/devel.