Move this to puppet::server instead.
Merge branch 'origin' into fixserver