master-bc-1606

https://issues.liferay.com/browse/LIFERAYQA-8488
https://issues.liferay.com/browse/LIFERAYQA-8521
https://issues.liferay.com/browse/LIFERAYQA-8670