Allow setting a default servername for initial puppet apply runs when there is no puppetmaster/enc available.
Allow setting the servername for a puppetmaster to use when bootstrapping it with a puppet apply run.
Merge branch 'feature/allow-servername-override' into develop