Update notes for submitted changes

* Reduce code duplication in rpm build code