Merge pull request #103 from mariapavlova/develop

Develop fb 5111
Merge pull request #105 from mariapavlova/develop

FB 5858
FB 5875

Conflicts:
	src/main/java/org/dasein/cloud/openstack/nova/os/compute/NovaServer.java