master-qa-6211

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