CSPACE-6115: Apply PAHMA-895 changes to the UpdateObjectLocationBatchJob.
Merge branch 'ucb-deploy_3.3' into pahma_3.3