changes for redhat openstack

Change-Id: I738c349e0f4f029f509ac71119ae30390bb08976
Merge "changes for redhat openstack"