Update notes for submitted changes

* Merge "OS-270 fixes" into havana/1.5