master
8286503: Enhance security classes
8311170: Simplify and modernize equals and hashCode in security area