Update notes for submitted changes

* Edits and shuffles FWaaS content