Merge branch '12822-keepproxy-token-scope'
authorTom Clegg <tclegg@veritasgenetics.com>
Mon, 18 Dec 2017 22:04:36 +0000 (17:04 -0500)
committerTom Clegg <tclegg@veritasgenetics.com>
Mon, 18 Dec 2017 22:04:36 +0000 (17:04 -0500)
refs #12822

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>


Trivial merge