Merge "Sensible equals and hashCode for FragmentEntity (CPS-1664 #1)"