fix merge error breaking compile
Revert "CLOUDSTACK-4950: fix the problem to support sessions to multiple vCenter instance"

This reverts commit ed0fbcc81c1928062054190ffcfab8bb59969cc2.