Cherry-pick masterless doc clarifications for 2014.7

For issue #16345. Same changes as PR #16346 but for the 2014.7 branch.