Add puppetmaster-common and fix identation issues