Patch to fix Java-8 build incompatibility, where the message test
started failing

This was the only failure I encountered building and running the
testsuite using mvn-3.0.4 and jdk8-b113