Merge "The code through out hosttracker assumes the switch manager service reference...