TRUNK-2694 Fix Performance hog: Maps and sets of URLs

(cherry picked from commit 358de98ed9954c3eb0b9b31031f7dffe0ee8a9b1)

manually added missing imports