CLOUDIFY-1483 implement storage interface for openstack, fixes applied.
CLOUDIFY-1483 implement storage interface for openstack. Fixes following a code review.
CLOUDIFY-1483 implement storage interface for openstack, Conflict resolution.
CLOUDIFY-1483 implement storage interface for openstack, Conflict resolution.
CLOUDIFY-1483 implement storage interface for openstack, Conflict resolution.
CLOUDIFY-1483 implement storage interface for openstack, Conflict resolution.
CLOUDIFY-1483 implement storage interface for openstack, Conflict resolution.
CLOUDIFY-1483 implement storage interface for openstack, Conflict resolution.
CLOUDIFY-1483 implement storage interface for openstack, Conflict resolution.
removed wrong "@overrides" annotations.
Merge conflicts.
Conflict resolution
Conflict resolution.
implementing getComputeContext
Merge.
Merge.
CLOUDIFY-1483 implement storage interface for openstack, Conflict resolution.
Merge.
Merge branch 'master' of https://github.com/CloudifySource/cloudify

Conflicts:
	esc/src/main/java/org/cloudifysource/esc/driver/provisioning/storage/openstack/OpenstackStorageDriver.java
	restful/src/main/java/org/cloudifysource/rest/controllers/ServiceController.java