master-qa-6207

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