more LLDPMessageBroker refactoring