Merge "Add volume encryption scenario tests"