CLOUDIFY-2147 expose the context node id (i.e where the task is executed in case this is an agent plugin)
CLOUDIFY-2049 Make workflow framework tasks single process, to allow in memory mocks, and avoid race conditions
Merge pull request #82 from CloudifySource/feature/CLOUDIFY-2147-relationship-plugin-api

Change api for relationship based tasks
Merge branch 'develop' into feature/CLOUDIFY-2149-json-events
Merge pull request #83 from CloudifySource/feature/CLOUDIFY-2149-json-events

CLOUDIFY-2149 convert cosmo events to json format
fixed wget -N issue for vagarant deb file
Merge remote-tracking branch 'origin/develop' into feature/CLOUDIFY-2073-n-instances

Conflicts:
	orchestrator/src/main/java/org/cloudifysource/cosmo/dsl/PluginArtifactAwareDSLPostProcessor.java
CLOUDIFY-2049 make deploying of applications asynchronous
CLOUDIFY-2049 change mocks to use in-memory instead of files to store state
CLOUDIFY-1926 Add node id that is waiting for a policy on another node
CLOUDIFY-2073 align naming conventions. remove tosca prefix
CLOUDIFY-2073 align naming conventions. remove tosca prefix
CLOUDIFY-2049 Make workflow framework tasks single process, to allow in memory mocks, and avoid race conditions
CLOUDIFY-2073 Improve mocks to store multiple state. Enhance multi-instance test assertions
CLOUDIFY-1926 Fix nil problems in unit tests
CLOUDIFY-1926 Better error handling
CLOUDIFY-2073 Add multi-instance mocks
CLOUDIFY-2073 Fix cloudify.management mock
Revert log4j.properties changes
CLOUDIFY-2147 add temporary api to enable running relationship workflow inside node workflow