ability to define multiple volumes and fixing some openstack concept issues
STRATOS-459

Signed-off-by: Manula Thantriwatte <manula@apache.org>
conflict resolution
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos