resolve vc extension registration error: https://bugzilla.eng.vmware.com/show_bug.cgi?id=1374509
Merge branch 'fix_vc_registration'