Fix travis build break
Merge branch 'develop' into feature/CLOUDIFY-2331-interface-operation-mapping

Conflicts:
	.travis.yml