Merge branch 'master' into 14874-protected-collection-properties
authorLucas Di Pentima <ldipentima@veritasgenetics.com>
Thu, 6 Jun 2019 18:13:20 +0000 (15:13 -0300)
committerLucas Di Pentima <ldipentima@veritasgenetics.com>
Thu, 6 Jun 2019 18:13:20 +0000 (15:13 -0300)
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>


Trivial merge