Bug 11317: (QA follow-up) Fix merge error and punctuation