Begin fixing tests. Done with NormativeStorageAndCommandTestIT
refactor tests
Fix cloudify driver to follow last updates on alien 4 cloud lifecycle generation.
Fix integration test by putting back template used on jenkins cloudify.
Merge branch 'develop' of https://github.com/alien4cloud/alien4cloud-cloudify2-provider into features/ALIEN-464

Conflicts:
	src/main/java/alien4cloud/paas/cloudify2/generator/RecipeGenerator.java
	src/test/it/alien4cloud/paas/cloudify2/GenericTestCase.java
[ALIEN-464] fix tests