MERGE from trunk: bug 379584: jaxws: StackOverflowError in GlobalTrustManagerService