Handle changes to imageId and private_ip.
Set novaclient to version 2.15.0.
   (cd src/python-novaclient; git checkout tags/2.15.0)
Switch to nova 1.1/2.0 API support by default, drop 1.0 support.   When debugging is turned on, enable HTTP-level novaclient debug logging as well.
Switch to v2.0 identity URLs in examples.
Workaround for pbr issues in novaclient- it refused to determine its own version, and would throw a runtime error.
Allow user to specify the API version (zOpenstackComputeApiVersion)
Bump version
Re-bundle all the upstream dependencies based on current versions in pypi, removing git submodule usage.
Version 1.1.6 -> 1.2.0dev.
Merge branch 'develop' into feature/2014.1_COMPAT

Conflicts:
	setup.py
Add 1.2.0 changelog.
Release: Version 1.2.0dev -> 1.2.0.
Merge branch 'release/1.2.0'