master-bc-845

https://github.com/brianchiu/liferay-portal-ee/pull/845