Move puppet::proxy::base and puppet::proxy to generic_tmpl