DOCS396, DOCS-1080, DOCS-1420, DOCS-1616 refactoring & updating prodnotes