Turn down the settings from 900 to 600 on the timeouts
BPFD-231 Merge branch 'hotfix-batch-not-triggered'