Merge "LLDP monitor interval update fixes"