CLEARWATER-LCM: XOP-375 - vif-locking=disabled allowed when vswitch controller active

Don't pull until we decide we need a hotfix.