Supporting both short hostnames and fqdn for labs role::puppet::self

Change-Id: I95c050ff64570c31860410546981796f673aea12