master-qa-6600

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