@alain, @rafael 

Test is here: https://nexedi.erp5.net/test_result_module/20180412-3688F368/2/view

Its failures which are different from  master one (https://nexedi.erp5.net/test_result_module/20180412-3501D1A/1) seems unrelated to my changes thus I propose to emrge it in and include in next webrunner release.

/reviewed-on nexedi/slapos!317