(DOC-1111) Port over interim changes to 3.6 docs, up thru 6475371