Index: lams_build/conf/domain.xml
===================================================================
diff -u -r828a1678aeb5cb37eda9d53c50a75b2cab809fe6 -re57c5f124d643991b5d13901d32bc686acabe706
--- lams_build/conf/domain.xml	(.../domain.xml)	(revision 828a1678aeb5cb37eda9d53c50a75b2cab809fe6)
+++ lams_build/conf/domain.xml	(.../domain.xml)	(revision e57c5f124d643991b5d13901d32bc686acabe706)
@@ -147,7 +147,10 @@
                 </logger>
                 <logger category="org.hibernate.engine.internal.StatefulPersistenceContext">
                     <level name="ERROR"/>
-                </logger>
+                </logger>            
+	             <logger category="org.hibernate.hql.internal.ast.HqlSqlWalker">
+	                <level name="ERROR"/>
+	            </logger>
                 <logger category="org.jboss">
                     <level name="INFO"/>
                 </logger>
Index: lams_build/conf/slim/standalone.xml
===================================================================
diff -u -r5f41e8a4d5b282901f1c514aadf94efb0329f9f3 -re57c5f124d643991b5d13901d32bc686acabe706
--- lams_build/conf/slim/standalone.xml	(.../standalone.xml)	(revision 5f41e8a4d5b282901f1c514aadf94efb0329f9f3)
+++ lams_build/conf/slim/standalone.xml	(.../standalone.xml)	(revision e57c5f124d643991b5d13901d32bc686acabe706)
@@ -209,6 +209,10 @@
             
             <logger category="org.hibernate.engine.internal.StatefulPersistenceContext">
                 <level name="ERROR"/>
+            </logger>            
+            
+             <logger category="org.hibernate.hql.internal.ast.HqlSqlWalker">
+                <level name="ERROR"/>
             </logger>
             
             <logger category="org.jboss">
Index: lams_build/conf/standalone.xml
===================================================================
diff -u -r5f41e8a4d5b282901f1c514aadf94efb0329f9f3 -re57c5f124d643991b5d13901d32bc686acabe706
--- lams_build/conf/standalone.xml	(.../standalone.xml)	(revision 5f41e8a4d5b282901f1c514aadf94efb0329f9f3)
+++ lams_build/conf/standalone.xml	(.../standalone.xml)	(revision e57c5f124d643991b5d13901d32bc686acabe706)
@@ -208,15 +208,7 @@
                     <handler name="HIBERNATEFILE" />
                 </handlers>
             </logger>
-            
-            <logger category="org.hibernate.engine.StatefulPersistenceContext"
-            	use-parent-handlers="false">
-                <level name="ERROR" />
-                <handlers>
-                    <handler name="HIBERNATEFILE" />
-                </handlers>
-            </logger>
-            
+
             <logger category="org.springframework.beans.factory.support.DefaultListableBeanFactory">
             	<level name="INFO"/>
             </logger>
@@ -229,6 +221,10 @@
                 <level name="ERROR"/>
             </logger>
             
+             <logger category="org.hibernate.hql.internal.ast.HqlSqlWalker">
+                <level name="ERROR"/>
+            </logger>
+            
             <logger category="org.jboss">
                 <level name="INFO" />
             </logger>
Index: lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java
===================================================================
diff -u -re0a7b3e91077a48612f883dc740e177efb582d99 -re57c5f124d643991b5d13901d32bc686acabe706
--- lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java	(.../ForgotPasswordServlet.java)	(revision e0a7b3e91077a48612f883dc740e177efb582d99)
+++ lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java	(.../ForgotPasswordServlet.java)	(revision e57c5f124d643991b5d13901d32bc686acabe706)
@@ -15,7 +15,7 @@
 import org.apache.log4j.Logger;
 import org.hibernate.id.Configurable;
 import org.hibernate.id.IdentifierGenerator;
-import org.hibernate.id.UUIDHexGenerator;
+import org.hibernate.id.UUIDGenerator;
 import org.hibernate.type.StringType;
 import org.lamsfoundation.lams.usermanagement.ForgotPasswordRequest;
 import org.lamsfoundation.lams.usermanagement.User;
@@ -99,7 +99,6 @@
      * @throws ServletException
      * @throws IOException
      */
-    @SuppressWarnings("unchecked")
     public void handleEmailRequest(Boolean findByEmail, String param, HttpServletResponse response)
 	    throws ServletException, IOException {
 
@@ -278,7 +277,7 @@
     public static String generateUniqueKey() {
 	Properties props = new Properties();
 
-	IdentifierGenerator uuidGen = new UUIDHexGenerator();
+	IdentifierGenerator uuidGen = new UUIDGenerator();
 	((Configurable) uuidGen).configure(StringType.INSTANCE, props, null);
 
 	return ((String) uuidGen.generate(null, null)).toLowerCase();
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170410.sql
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170410.sql	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170410.sql	(revision e57c5f124d643991b5d13901d32bc686acabe706)
@@ -0,0 +1,15 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+----------------------Put all sql statements below here-------------------------
+
+-- LDEV-4184 Allow longer ID format
+
+ALTER TABLE lams_learning_design MODIFY COLUMN content_folder_id CHAR(36);
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
Index: lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java
===================================================================
diff -u -rc9e9b062129d0833394209d83ea4911e37e97716 -re57c5f124d643991b5d13901d32bc686acabe706
--- lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java	(.../FileUtil.java)	(revision c9e9b062129d0833394209d83ea4911e37e97716)
+++ lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java	(.../FileUtil.java)	(revision e57c5f124d643991b5d13901d32bc686acabe706)
@@ -48,7 +48,7 @@
 import org.apache.log4j.Logger;
 import org.hibernate.id.Configurable;
 import org.hibernate.id.IdentifierGenerator;
-import org.hibernate.id.UUIDHexGenerator;
+import org.hibernate.id.UUIDGenerator;
 import org.hibernate.type.StringType;
 import org.lamsfoundation.lams.learningdesign.service.ToolContentVersionFilter;
 import org.lamsfoundation.lams.util.zipfile.ZipFileUtilException;
@@ -626,25 +626,19 @@
 	    filename = unEncodedFilename;
 
 	}
-	
-	// wrap filename in quotes as if it contains comma character Chrome can throw a multiple headers error 
+
+	// wrap filename in quotes as if it contains comma character Chrome can throw a multiple headers error
 	filename = "\"" + filename + "\"";
 
 	return filename;
     }
 
     public static String generateUniqueContentFolderID() {
+	IdentifierGenerator uuidGen = new UUIDGenerator();
+	((Configurable) uuidGen).configure(StringType.INSTANCE, new Properties(), null);
 
-	String newUniqueContentFolderID = null;
-	Properties props = new Properties();
-
-	IdentifierGenerator uuidGen = new UUIDHexGenerator();
-	((Configurable) uuidGen).configure(StringType.INSTANCE, props, null);
-
 	// lowercase to resolve OS issues
-	newUniqueContentFolderID = ((String) uuidGen.generate(null, null)).toLowerCase();
-
-	return newUniqueContentFolderID;
+	return ((String) uuidGen.generate(null, null)).toLowerCase();
     }
 
     /**