master-qa-6203

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