Merge in puppetmaster tweaks.

Change-Id: I8f45fbbca2c6734967cd04ad82d99403182549f3