Use IntMap to store pointer against pointer UUID. Fixes #2516
Merge pull request #2528 from Tom-Ski/gwt

Use IntMap to store pointer against pointer UUID. Fixes #2516