master-qa-6275

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