Minor changes for tests
Merge branch 'master' of github.com:choreos/enactment_engine

Conflicts:
	EnactmentEngine/src/test/java/org/ow2/choreos/integration/ee/IncreaseNumberOfInstancesTest.java
	EnactmentEngineAPI/src/main/java/org/ow2/choreos/services/datamodel/DeployableService.java
	EnactmentEngineAPI/src/main/java/org/ow2/choreos/tests/ModelsForTest.java
Merge branch 'master' of github.com:choreos/enactment_engine
Updating glimpse consume to new API