Update notes for submitted changes

* Backport 336093 from branches/1.8
Update notes for submitted changes

* Backport r344539 from branches/1.8
Update notes for submitted changes

* Properly document previous patches