[weld-issues] [JBoss JIRA] (WELD-963) Change Singleton to use a Map of ids -> singletons