master-bc-2394

https://issues.liferay.com/browse/LIFERAYQA-11001
https://issues.liferay.com/browse/LIFERAYQA-6464
https://issues.liferay.com/browse/LIFERAYQA-10994
https://issues.liferay.com/browse/LIFERAYQA-11000
https://issues.liferay.com/browse/LIFERAYQA-10829