merge in rejected libxo patch and remove rej file
Merge branch 'kim_ap_libxo_netstat' of https://github.com/kimshrier/freebsd into kimshrier-kim_ap_libxo_netstat