Update notes for submitted changes

* Ignore conflict on v2 auto role assignment (bug 1161963)