Merge branch '13879-arvados-server' closes #13879
authorPeter Amstutz <pamstutz@veritasgenetics.com>
Fri, 20 Jul 2018 20:52:52 +0000 (16:52 -0400)
committerPeter Amstutz <pamstutz@veritasgenetics.com>
Fri, 20 Jul 2018 20:52:52 +0000 (16:52 -0400)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>


Trivial merge