Release/2.1 netmap

These are the netmap mods for Bro on the release/2.1-netmap branch.