rewrite documentation of 2 new knobs such that their definition matches
with what these knobs actually do. #4040
Merge branch 'V8_1_6-branch'