Moving to OpenStack only codebase
Merge branch 'master' into v2.x