PAHMA-809: Deploy now deletes tomcat lib/tenants and lib/cspace-config-*.xml files.
Merge branch 'ucb-deploy_3.2' into botgarden_3.2