CMFDiffTool from branch to avoid trouble with mixed environment
Merge branch '4.3' of github.com:plone/buildout.coredev into 4.3