Merge "Bug 2071: Check to see if we still have the switch in LLDPSpeaker"