PAHMA-1013: add two new handlers, remove 1
Merge remote-tracking branch 'cspace-deployment/master' into ucb-deploy