Merge "Minor formatting fixes to .mdp option documentation" into release-4-5-patches