a few teaks for tests
Merge remote-tracking branch 'upstream/master'
Jython 2.5.3 codecs leak fixed

Signed-off-by: Julien <jlehuraux@chyro.fr>