master-bc-3171

https://issues.liferay.com/browse/LIFERAYQA-12528
https://issues.liferay.com/browse/LIFERAYQA-12520
https://issues.liferay.com/browse/LIFERAYQA-12525
https://issues.liferay.com/browse/LIFERAYQA-12563
https://issues.liferay.com/browse/LIFERAYQA-12535