Merge "DO NOT MERGE docs: Removing spurious end </pre> tag" into oc-mr1-dev