make sync_vcpetenant use new mechanism when appropriate
2 files changed