Feature #3305: Add context info for vCenter VMs

(cherry picked from commit 6dd30ec6a66d6b18bdde5639f35ba5f390fdcbb9)
Fix for cli error

(cherry picked from commit 6124ba7d2c89eb366935c6d4d26a6b21ee17c223)