15716: Merge branch 'master' into 15716-api-keepservice-list-fix
authorLucas Di Pentima <ldipentima@veritasgenetics.com>
Fri, 18 Oct 2019 22:04:08 +0000 (19:04 -0300)
committerLucas Di Pentima <ldipentima@veritasgenetics.com>
Fri, 18 Oct 2019 22:04:08 +0000 (19:04 -0300)

Trivial merge