Wip JENKINS-21478 regression test
Fix email-ext test
Fix groovy