Issue #1317626: Followup to docs updates to remove merge conflicts.

Part of https://github.com/backdrop/backdrop-issues/issues/166, this fixes merge conflicts introduced in porting Drupal issue #1317626.