DO NOT MERGE - Juno fixes

This PR contains a running list of changes to pull the quickstack modules in line with OPM Juno.

Testing against redhat-openstack/openstack-puppet-modules@caae6597e87faaa8ae4c35e3ecd4165f46487d4d
I am concerned this is cancelled out by this recently merged patch to opm:
https://github.com/redhat-openstack/openstack-puppet-modules/pull/131/files