master-bc-2578

https://issues.liferay.com/browse/LIFERAYQA-11325

The master version of this pull having an extra commit was intentional.