Make the report query key calculations saner, by sanitizing the query and actually using it to execute the queries. Otherwise there's too much potential for differences in the key calculation and the actual index search code.

Make sure we actually do what queryplan did and support all the weird ways in which one can pass query restrictions to the catalog

  (https://bugs.launchpad.net/zope2/+bug/143273)

Warn on App.ImageFile.ImageFile deprecated assumption of software_home. Forward ported 114749 from 2.12 branch