Merge "OPNFLWPLUG-898 Improve code quality in liblldp module"