Merge branch '12025-perm-cache-version'
authorTom Clegg <tom@curoverse.com>
Tue, 25 Jul 2017 19:14:28 +0000 (15:14 -0400)
committerTom Clegg <tom@curoverse.com>
Tue, 25 Jul 2017 19:14:28 +0000 (15:14 -0400)
refs #12025

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>


Trivial merge