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

o Leave BBB imports behind in old locations.

Integrated zLOG package back into this package. There's really no reason why anyone should want to use that one stand-alone