Merge "Add OOM update so-bpmn-infra's Override.yaml file"