master-qa-8174

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