Merge pull request #8 from greese/develop

merge in upstream dasein changes
changes related to upstream merging

Ref TheWeatherCompany/dasein-cloud-aws#62
Ref TheWeatherCompany/dasein-cloud-core#42
fixed one firewall test in error
update snapshot
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
Merge pull request #46 from TheWeatherCompany/develop

TWC changes