master-bc-2741

https://issues.liferay.com/browse/LIFERAYQA-11675
https://issues.liferay.com/browse/LIFERAYQA-10485
https://issues.liferay.com/browse/LIFERAYQA-10269