master-qa-7334

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