Changes after AD, GEN-ART review:

 - One missed Ted's concern addressed (clients MUST NOT send the option)
 - Moved map-t to informative (can't have normative refs to experimental)