PAHMA-933: Undo changes to collectionobject naturalhistory tests, since unified config makes them unnecessary.
Merge branch 'ucb-deploy_4.0' into pahma_4.0