Changes to support working with DevStack/OpenStack