Initial changes to support setting up master with remote puppetdb