master-qa-6814

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