master-bc-3234

https://issues.liferay.com/browse/LIFERAYQA-11680

The ee-6.2.x/ee-6.2.10 pulls for this have an additional SF commit.