Prepare for next dev iteration
Merge pull request #41 from andylyall/develop

Prepare for next dev iteration
Fixes for image and static ip tests

Conflicts:
	src/main/java/org/dasein/cloud/test/network/StatefulVLANTests.java
Merge pull request #43 from maksimov/develop

Fixes for image and static ip tests
Added null-check for testVMId
Merge pull request #44 from maksimov/develop

Added null-check for testVMId
Merge pull request #10 from greese/develop

Upstream merge