PAHMA-633: Restore rules for settings.xml to xmlmerge.properties, since core and lifesci are still using them.
Merge branch 'ucb-deploy_3.2' into pahma_3.2