master-bc-1273

https://issues.liferay.com/browse/LIFERAYQA-7820
https://issues.liferay.com/browse/LIFERAYQA-7821
https://issues.liferay.com/browse/LIFERAYQA-7842
https://issues.liferay.com/browse/LIFERAYQA-7863
https://issues.liferay.com/browse/LIFERAYQA-7874
https://issues.liferay.com/browse/LIFERAYQA-7906
https://issues.liferay.com/browse/LIFERAYQA-7840
https://issues.liferay.com/browse/LIFERAYQA-7843
https://issues.liferay.com/browse/LIFERAYQA-7831