Merge branch 'stable-2.7' into stable-2.8

* stable-2.7:
  Make plugin servlet's context path authorization aware