Merge branch 'ibm/rook-fix' into 'master'

Walter Drequested to merge
cherry-pick-45e23b26 into release/0.17

fix: cos config change

See merge request !583 (merged)

(cherry picked from commit 45e23b26)

ea6604de fix: cos config change

Merge request reports