making matches use IPv4Network directly for srcip/dstip map values
bug fixes: ensure packets are unmodified despite IPv4network changes
Merge branch 'dev-master'