OWB-755 always properly clean singleton map on shutdown


git-svn-id: https://svn.apache.org/repos/asf/openwebbeans/trunk@1444409 13f79535-47bb-0310-9956-ffa450edef68