Merge "Fix volume v2 capabilities/scheduler-stats tests to test v2 APIs"