Merge "[feat][core] refactor vsphere lock config"