master-bc-1235

https://issues.liferay.com/browse/LIFERAYQA-7292
https://issues.liferay.com/browse/LIFERAYQA-7923
https://issues.liferay.com/browse/LIFERAYQA-7782

This is a resending of:
https://github.com/brianchandotcom/liferay-portal/pull/17207

I've fixed the commit messages. Test Fixes commits don't have associated tickets, but new tests do.