BZ-1067418 - Class loader/JAXBContext problems
(cherry picked from commit 3e0b19cb075b2b811930ada3d9d2e050720e5e94)