Merge branch '14099-websocket-service'
authorPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Fri, 31 Aug 2018 08:55:57 +0000 (10:55 +0200)
committerPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Fri, 31 Aug 2018 08:55:57 +0000 (10:55 +0200)
refs #14099

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>


Trivial merge