Implement Comparable and Comparator according to contract

Java 7 might throw an IllegalArgumentException when it detects a Comparable or Comparator implementation violating its contract. Therefore we need to check and fix all implementations in our code base.