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
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
Merge pull request #46 from TheWeatherCompany/develop

TWC changes
Merge pull request #12 from greese/develop

Merge pull request #46 from TheWeatherCompany/develop
Implemented stateless tests for SSL certificates (#670)
Implemented stateful tests for SSL certificates (#670)
ELB clean up
Added a test of wide search criteria image search, to make sure large number of images can be loaded and parsed correctly.
Merge pull request #48 from maksimov/develop

Develop
Simplified SSL certificates API: got rid of SSLCertificateMetadata; setting SSL on LB takes certificateId instead of Arn (#670)
Fixed leftovers of providerSslCertificateId (#670)
Merge pull request #14 from greese/develop

Merge upstream dasein