merge 8.5 puppet code to master

8.5 has a few things that master doesn't, we want them in here.  including:
- more config options
- database replication (whee)