Always wrap contents of zcml-additional with a <configure /> node.

This makes it possible to use += assignments with zcml-additional.
Merge pull request #13 from plone/lgraf-wrap-additional-zcml-with-configure

Always wrap contents of zcml-additional with a <configure /> node.