Merge branch 'master' into 14874-protected-collection-properties
authorLucas Di Pentima <ldipentima@veritasgenetics.com>
Tue, 11 Jun 2019 19:29:01 +0000 (16:29 -0300)
committerLucas Di Pentima <ldipentima@veritasgenetics.com>
Tue, 11 Jun 2019 19:29:01 +0000 (16:29 -0300)
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>


Trivial merge