Merge branch 'master' of https://github.com/CiscoSystems/openstack-sqe into feature