Fix some XML nits

Found by the strict checking option of xml2rfc.

Change-Id: Icb02fbc5812119776741dbd1393d10b935072f25