master-bc-2247

https://issues.liferay.com/browse/LIFERAYQA-9621
https://issues.liferay.com/browse/LIFERAYQA-10355
https://issues.liferay.com/browse/LIFERAYQA-10542
https://issues.liferay.com/browse/LIFERAYQA-10491
https://issues.liferay.com/browse/LIFERAYQA-10563