master-bc-2370

https://issues.liferay.com/browse/LIFERAYQA-10578
https://issues.liferay.com/browse/LIFERAYQA-8058
https://issues.liferay.com/browse/LIFERAYQA-8060
https://issues.liferay.com/browse/LIFERAYQA-10751