Merge plone/buildout.jenkins/master into fork