12318: Merge branch 'master' into 12318-update-libcloud-pin
authorLucas Di Pentima <ldipentima@veritasgenetics.com>
Fri, 17 Nov 2017 17:19:08 +0000 (14:19 -0300)
committerLucas Di Pentima <ldipentima@veritasgenetics.com>
Fri, 17 Nov 2017 17:19:08 +0000 (14:19 -0300)
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>


Trivial merge