Merge "Fix volume backup import test"