Fix OC 4.0 params and tolerations

PROD-22649

Change-Id: Ifd40ebd58a5d6822d4eb013f12883190fd2fc966
(cherry picked from commit 32dbd2986358a7956a12a7c592e01d3d4288a408)
4 files changed