Bug 2306 - Check for a nil/empty puppetmaster var, and fall back to fqdn. 

Check if puppetmaster var is nil or empty when configuring puppet agent, and fall back to fqdn where appropriate.