Final fixes to java mutation testing
Merged from master