Update notes for submitted changes

* Minor changes to make wadl valid
Update notes for submitted changes

* Remove merge conflict markers from xsds & update targetNamespace