Refactoring puppetmaster::self to allow for puppet clients.

You should now use role::puppet::self instead.
puppetmaster::self is retained for backwards compatiblity.

Woowee, let's see if this works!

Change-Id: I7d8d68684e726c79d56e9027423590b94957cbcd
Merge "Refactoring puppetmaster::self to allow for puppet clients." into production