ULSFO uses new puppetmasters

Have ULSFO use the new puppetmaster infrastructure.

Change-Id: I251fdcdb52167af0b259cba861e474716bd68ffe