Merge "Migrate topology-lldp-discovery to use Uint types"