Merge commit 'refs/changes/20/75120/6' of git://gold.eng.hq.xensource.com/git/github/openstack/tempest into tmpbranch