master-bc-1509

https://issues.liferay.com/browse/LIFERAYQA-8207
https://issues.liferay.com/browse/LIFERAYQA-8515
https://issues.liferay.com/browse/LIFERAYQA-3799