Combine
Merge branch 'newconf' of https://github.com/CiscoSystems/openstack-sqe into newconf