Update windows launch4j
Update macosx launch4j
Merge remote-tracking branch 'upstream/2.10.x' into 2.10.x