Prevented potential infinite recursion in hashCode/equals

Issue: SPR-11219
Consistent non-declaration of serialVersionUID

Issue: SPR-11242
Polishing

Issue: SPR-11242