Draft: Merge changes from M14-master to M16-master for upgrade
(cherry picked from commit d029626b)
Conflicts: osdu-helm-library/templates/_deployment.yaml
(cherry picked from commit d029626b)
Conflicts: osdu-helm-library/templates/_deployment.yaml