LPS-46098 Fix BundleServletContextTest
Merge branch 'master' of github.com:liferay/liferay-plugins