Update notes for submitted changes

* Merge remote-tracking branch 'gerrit/master' into dev/reorg
* Revert "rhel7 extras repo"
* Revert "Fix RHEL repo template so that extras is in the right place"