Merge "Remove volume client and usage in scenario tests"