DOCS-2043 clean up warnings due to op reorg
DOCS-2043: fixes for v2.2