Fix NDT S2C test for legacy clients + several small fixes
Merge pull request #303 from m-lab/sandbox-roberto-remove-pcap-datatype Temporarily remove the pcap datatype from pusher
Merge pull request #303 from m-lab/sandbox-roberto-remove-pcap-datatype Temporarily remove the pcap datatype from pusher