(cherry picked from commit 781648fb10) Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> Conflicts: engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
781648fb10