refactoring access to DeployableService.serviceInstances
Merge branch 'master' of https://github.com/choreos/choreos_middleware

Conflicts:
	EnactmentEngineAPI/src/main/java/org/ow2/choreos/services/datamodel/DeployableService.java