master-qa-6773

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