Merge branch 'stable-2.14' into stable-2.15 * stable-2.14: Extend ServletModule instead of HttpPluginModule Change-Id: I225c36714cf5ccc0106a6f66f994362cee5e85de