Add workaround for bug 1211001
Merge branch 'master' of github.com:citrix-openstack/qa