12055: Merge branch 'master' into 12055-nodemanager-ec2-tags
authorLucas Di Pentima <ldipentima@veritasgenetics.com>
Wed, 16 Aug 2017 15:20:38 +0000 (12:20 -0300)
committerLucas Di Pentima <ldipentima@veritasgenetics.com>
Wed, 16 Aug 2017 15:20:38 +0000 (12:20 -0300)
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>


Trivial merge