(from getambassador.io) Fix releaseNote after merge
(from getambassador.io) Fix releaseNote after merge

I fixed some merge conflicts incorrectly, so this commit fixes that.

datawire/telepresence,datawire/telepresence,datawire/telepresence