Merge "Remove deprecated config options for volume API selection"