2.6 rel notes: DOCS-1948 entered but commented out
DOCS-1980, DOCS-1934, DOCS-1935, DOCS-1936 user-defined roles