master-bc-929

https://issues.liferay.com/browse/LIFERAYQA-6527

This is a re-sending of:
https://github.com/brianchandotcom/liferay-portal/pull/15687

The variables are now alphabetized.