master-qa-8660

http://issues.liferay.com/browse/LIFERAYQA-8660