Sync text source to RFC6386 text, as published 2011-11-10.
Sync to published RFC 6386 text. Change-Id: I9f4b56c11e882fc4f37bdbae65a55cfa8f63312d