Include catalog setup in 3031 upgrade
Cleanup
Add Client filter to contact lookup on page load

Fixes bika.health/#87