Merge "Fix rendering issues in Configuration documentation" into stable-2.11