Let's pick up all fixes and improvements accumulated upstream to be used together with Zope4/Python2. /reviewed-by @jerome, @levin.zimmermann /reviewed-on !1332
