Merge "Fix some FileOpBatch IDEA errors"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 31 Dec 2015 01:11:13 +0000 (01:11 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 31 Dec 2015 01:11:13 +0000 (01:11 +0000)

Trivial merge