master-bc-704

http://issues.liferay.com/browse/LIFERAYQA-5275

This is a resending of:
https://github.com/brianchandotcom/liferay-portal/pull/13181