Fix #1438 "Remove HSQLDB JAR and related"
Fix #1439 "Error when uploading large image in full portlet"