master-bc-2539

https://issues.liferay.com/browse/LIFERAYQA-11185 
https://issues.liferay.com/browse/LIFERAYQA-10818
https://issues.liferay.com/browse/LIFERAYQA-11192
https://issues.liferay.com/browse/LIFERAYQA-11261