Merge "Adds scenario tests for volume encryption"