Merge "Skip volume snapshot tests if feature is not enabled"