Merge "Fix for volume quota class test"