master-qa-6210

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