updating poms for 1.0.0-SM18-SNAPSHOT development
updating develop poms to master versions to avoid merge conflicts
Merge branch 'master' into develop
Updating develop poms back to pre merge state
Update alien4cloud dependency version.
fix tests due to case sensitivity
blockstorage device and path as properties
Manage multiple devices attachements (as this may changed based on linux version).
ALIEN-544 fixed bug, nodeTemplateId not passed to BlockStorage lifecycle scripts
fixed typo in Blockstorage formatMount  velocity template
fixed typo in Blockstorage formatMount  velocity template
fixed typo in Blockstorage formatMount  velocity template
fixed some broken tests
fixed some broken tests
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