Re-add commented-out test pkgs; ignore decorator pkg for tests.
Merge branch '4.3' of github.com:plone/buildout.coredev into 4.3