Merge branch '10041-test-arvados-keep-services'
authorWard Vandewege <ward@curoverse.com>
Sun, 9 Oct 2016 00:38:01 +0000 (20:38 -0400)
committerWard Vandewege <ward@curoverse.com>
Sun, 9 Oct 2016 00:38:01 +0000 (20:38 -0400)
refs #10041


Trivial merge