gerrit 2.7-rc5
Merge branch 'stable-2.6' into stable-2.7

* stable-2.6:
  Fix reenabling of plugins