- add testcase (which used to cause compiler failure) - remove <?> from PayloadMatcher to fix error - add casts to FileInboundCAWRDTests to deal with backwards compatibility breakage In some cases backwards compatibility is broken, see INT-1790 for details.