master-bc-1078

https://issues.liferay.com/browse/LIFERAYQA-7542

The master version of this is different from the ee-6.2.x/ee-6.2.10 versions because the file that was edited is different in master. Just letting you know that a straight cherry-pick might not work, so it'd be better to bring in the ee-6.2.x/ee-6.2.10 versions directly.