Update notes for submitted changes

* Merge remote-tracking branch 'origin/grizzly/1.5' into havana15_2
* Merge remote-tracking branch 'origin/havana/1.4' into havana15