Change field types from LinkedHashSet back to HashSet to retain binary compatibility (#11432)

svn changeset:25964/svn branch:6.8

Change-Id: Iddf0fa7de10a788e1a51e006e92ed3976a39a30b