Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Extend ServletModule instead of HttpPluginModule

Change-Id: I6ea4697309e14b1bb2fb1729c043014d33fc30c2