master-qa-6274

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