changes for integration of new quantum module

Update controller and compute manifests in openstack puppet module to align with the new quantum module

When merging, also need to merge a pull for the folsom branch manifests, as well as swap the new quantum module in place