master-qa-6874

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