PAHMA-633: Update tenants/pahma/base-collectionobject.xml to be based on the 3.2 version of the default file.
PAHMA-633: Reorder fields in local-authority-person.xml to match the new order in defaults/base-authority-person.xml.
PAHMA-633: Remove objectProductionDate from local-collectionobject.xml, since the configuration in the base file (with ui-search='repeatable') is now what we want.
PAHMA-633: Tentatively remove imgThumb customization from local-procedure-media.xml, since media fan-out is reportedly fixed in 3.2.
PAHMA-633: Break up tenants/pahma/settings.xml into overlays that are merged into defaults/settings.xml.
PAHMA-633: Move xmlmerge configuration for settings.xml into xmlmerge-settings.properties, and add some rules.
PAHMA-633: Add ids onto map elements, so xmlmerge can be used to modify them.
Merge branch 'ucb-deploy_3.2' into pahma_3.2