master-bc-2470

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