Merge "Switch to use primary credential in volume backup tests"