Use hiera param lookup for puppet::master class

This code appears to have been written for pre 3.0 puppet, which didn't
have automatic parameter lookup.  Moved the puppet::master class
inclusion to the include instead of class model so that we can have it
declared in more than one place without errors.