master-qa-6628

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