Fixed use of Java6 API

This removes the use of `newSetFromMap` for a simpler concurrent set. This will be less performant probably. I haven't found another way but maybe some utility in Spring itself can build  that.

Issue: SPR-11313