r21587: more sync with 3.0.25 tree (remove old directories and copy pcap2nbench)