XOP-375: allow vif-locking=disabled when vswitch controller attached

Signed-off-by: Mike McClurg <mike.mcclurg@citrix.com>
Merge pull request #1392 from mcclurmc/xop-375-vif-locking-clearwater

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