Merge branch 'LPS-47491-1' of github.com:willnewbury/liferay-portal into LPS-47491-1

Conflicts:
	portal-impl/test/integration/com/liferay/portal/search/DocumentImplTest.java
	portal-impl/test/integration/com/liferay/portal/servlet/FriendlyURLServletTest.java
	portal-impl/test/integration/com/liferay/portal/servlet/filters/i18n/I18nFilterTest.java