master-qa-6236

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