r22456: Merge wireshark and ejs test improvements.