Updated test with simple Java application deployment
Minor tidying up
Configure applications in catalog
Calculate SERVICE_UP on infrastructure from JVMs
Updated test for WaratekInfrastructure
Handle start and stop of Waratek infrastructure better
Add more assertions to deployment test
Fix SimpleJavaApp creation
Updtes to dynamic location create and delete methods
Fixes to the release behaviour of WaratekLocation
Fix stop behaviour for container in test
Misc tidying up
Updated test with simple Java application deployment
Minor tidying up
Configure applications in catalog

Conflicts:

	src/main/java/com/waratek/cloudvm/BasicInfrastructure.java
Calculate SERVICE_UP on infrastructure from JVMs
Updated test for WaratekInfrastructure
Handle start and stop of Waratek infrastructure better
Add more assertions to deployment test
Fix SimpleJavaApp creation