Fixes for image and static ip tests

Conflicts:
	src/main/java/org/dasein/cloud/test/network/StatefulVLANTests.java