Update notes for submitted changes

* Move Heat to a single heat.conf