patch for RIVER-301

[Jonathan Costers]

Just a heads up: I've made significant progress integrating the QA test
suite into the River build process. Please comment, test my patch attached
to RIVER-301 in JIRA.

Best
Jonathan