Merge "Minor changes to netlink code."