[tripleo] OVB 2.0-dev branch merged to master

In preparation for importing OVB to Gerrit, the 2.0-dev branch was merged back to master. If the 2.0 changes break you, please use the stable/1.0 branch instead, which was created from the last commit before 2.0-dev was merged. -Ben