(from getambassador.io) Merge branch 'master' into keonimuller/dev/tp-demo-node-improvements
(from getambassador.io) Merge branch 'master' into keonimuller/dev/tp-demo-node-improvements

datawire/telepresence,datawire/telepresence,datawire/telepresence