CLOUDIFY-2083 renaming relationship template attribute names
CLOUDIFY-2124 add workflow ref support to workflows relationships
CLOUDIFY-2083 add relationship templates inheritance support
Merge remote-tracking branch 'remotes/origin/feature/CLOUDIFY-2083-relationships-modifications' into feature/CLOUDIFY-2124-relationship-wf-reference

Conflicts:
	orchestrator/src/test/java/org/cloudifysource/cosmo/dsl/AbstractDSLProcessorTest.java
Merge branch 'develop' into feature/CLOUDIFY-2083-relationships-modifications
CLOUDIFY-2083 cleanup
Merge pull request #76 from CloudifySource/feature/CLOUDIFY-2083-relationships-modifications

Relationships modifications:
CLOUDIFY-2124 relationship workflow reference
Merge branch 'develop' into feature/CLOUDIFY-2124-relationship-wf-reference
CLOUDIFY-2130 add argument to configure config directory
Merge pull request #77 from CloudifySource/feature/CLOUDIFY-2130-bootstrap-manager-mod

Enable running bootstrap_lxc_manager on any host (not just vagrant hosts)
CLOUDIFY-2124 relationship workflow ref
Merge branch 'develop' into feature/CLOUDIFY-2124-relationship-wf-reference