Merge "Fix up deprecation of wfMemcKey()/wfGlobalCacheKey()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 24 May 2017 16:23:46 +0000 (16:23 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 24 May 2017 16:23:47 +0000 (16:23 +0000)

Trivial merge