Warning fixes, exposing findbugs bugs, mostly threading related
Also remove unused adapters bundle map. Should remove all XMLElement refs from the service registration too, as it consomes significant memory