Fix travis build break
Merge branch 'develop' into feature/CLOUDIFY-2285-runtime-model-phase1