Implement equals/hashCode in ConstraintMatch, ConstraintMatchTotal and Indictment (for usage in Map, Set, etc)

While implementing a ConstraintMatchAwareIncrementalScoreCalculator I noticed, that the removeConstraintMatch method in ConstraintMatchTotal is not working correctly, as there is no hashCode implementation for ConstraintMatch.
I am trying to use the ConstraintMatchTotal.getScore method to return the score in the calculateScore method, but it fails, since the beforeVariableChanged method cannot remove the respective ConstraintMatch.
Also, as it is today, the compareTo method of ConstraintMatch is not consistent with the equals method, thus it breaks the compareTo contract.
(I have modified OptaPlanner to include the equals and hashCode methods - consistent with compareTo - and it is working fine.)