Update to most recent version of openstack modules

Updating to upstream version of each module, including
changes to puppet templates required by new modules

Change-Id: I3efeb54d2f89020c989ef5834ddce1ea12c62877
Merge "Update to most recent version of openstack modules"