Create a branch for z3c.autoinclude-less package. This requires significant modifications in configure.zcml and should therefore be tested with other packages (kofacustom, etc.) before going into production.