Merge "Add extra_msg and server parameter to check_vm_connectivity"