Update notes for submitted changes

* Update tripleo-heat-templates: mention merge tool