The spec has settled on not allowing these constraints to be negotiated, so all
that is left is the negotiation of the set of rids.
Also, add an include to eliminate some bot spam.
Differential Revision: https://phabricator.services.mozilla.com/D156830