1139267: VHM thread should not be blocked on any connection code + unit test changes