Merge "private" pillar names into pillar top file

This is because Salt doesn't support multiple pillar top files. The
sensitive pillar files themselves are still kept on the server.
Fully manage salt-master

So its entire state is captured in our git repo (and the relevant
pillar.)