Update notes for submitted changes

* Use merge.py for the undercloud templates.