master-bc-1611

https://issues.liferay.com/browse/LIFERAYQA-8661
https://issues.liferay.com/browse/LIFERAYQA-8630