Updated openstack/openstack
Project: openstack/keystone  dc089f73b380e7f6ec71a90f62b56474bb8ad10b

Add workaround to support tox 1.7.2

Conflicts:
	tox.ini

Change-Id: I58542f6e7dbbad98517c09b6176b9827f66dd1ff
Partial-Bug: 1348818
(cherry picked from commit 61b44eaceb3f57ef1d34e6a358398e36f49ba396)