NOJIRA: Clean up xmlmerge configurations to reduce confusion.
Merge branch 'ucb-deploy_3.2' into pahma_3.2