Merge "Remove use of deprecated config options for volume API selection"