master-bc-3199

https://issues.liferay.com/browse/LIFERAYQA-12582
https://issues.liferay.com/browse/LIFERAYQA-12651

The ee-6.2.x/ee-6.2.10 versions of this pull will have more commits.