CLOUDIFY-2083 continue work on feature. commit in order to merge changes from develop
Merge branch 'develop' into feature/CLOUDIFY-2083-relationship-interface

Conflicts:
	orchestrator/src/main/java/org/cloudifysource/cosmo/dsl/PluginArtifactAwareDSLPostProcessor.java
	orchestrator/src/main/resources/cloudify/tosca/types/types.yaml
CLOUDIFY-2083 fix broken tests
CLOUDIFY-2083 add test and fix some bugs
CLOUDIFY-2083 fix broken unit tests
Merge branch 'develop' into feature/CLOUDIFY-2083-relationship-interface
CLOUDIFY-2083 add basic dsl unit tests for relationship interfaces and relationship templates
Merge pull request #72 from CloudifySource/feature/CLOUDIFY-2083-relationship-interface

Integrate basic support for defining an inteface on a relationship