Revert "Several minor changes to the openstack manifest:"

This reverts commit 305324920720dbbac9cdc8bff1c562bea82b0ce9

Change-Id: I51b224c5ea98e4cd505278a39fb9f310c98df95a
Merge "Revert "Several minor changes to the openstack manifest:"" into production