Disabling v1 operations when in v2 mode
Merge pull request #2451 from danmcp/master

Merged by openshift-bot