Tracking stuff I've found from cloud-puppetmaster-03 that shouldn't be there:
- conftool client / syncing
- external_clouds_vendors
- this is broken, although we might want to just fix it to only push things to the private repo
- swift fetch-rings
- puppet-merge
Most of that comes from profile::puppetmaster::frontend.