Various fixes to the product

- now it is z3c.autoinclude aware
- added a null upgrade step

The upgrade step is needed to properly migrate the plone article tool, so we can avoid the red esclamation mark in the ZMI.