Merge "Add OOM update so-openstack-adapter override.yaml"