Merge branch 'debian/ocata' of...

Merge branch 'debian/ocata' of https://anonscm.debian.org/git/openstack/old/gerrit/deb-python-oslo.config into debian/ocata