azkaban-uncached

diff --git a/src/java/azkaban/jobtype/JobTypeManager.java b/src/java/azkaban/jobtype/JobTypeManager.java
index 65c747e..e66b31f 100644
--- a/src/java/azkaban/jobtype/JobTypeManager.java
+++ b/src/java/azkaban/jobtype/JobTypeManager.java
@@ -106,9 +106,15 @@ public class JobTypeManager
 			if(confFile != null) {
 				globalConf = new Props(null, confFile);
 			}
+			else {
+				globalConf = new Props();
+			}
 			if(sysConfFile != null) {
 				globalSysConf = new Props(null, sysConfFile);
 			}
+			else {
+				globalSysConf = new Props();
+			}
 		}
 		catch (Exception e) {
 			throw new JobTypeManagerException("Failed to get global jobtype properties" + e.getCause());
@@ -199,10 +205,13 @@ public class JobTypeManager
 				conf = new Props(commonConf, confFile);
 //				conf = PropsUtils.resolveProps(conf);
 			}
-			if(sysConfFile != null) {
-				sysConf = new Props(commonSysConf, sysConfFile);
-				sysConf = PropsUtils.resolveProps(sysConf);
+			else {
+				conf = new Props(commonConf);
 			}
+			
+			sysConf = new Props(commonSysConf, sysConfFile);
+			sysConf = PropsUtils.resolveProps(sysConf);
+
 		}
 		catch (Exception e) {
 			throw new JobTypeManagerException("Failed to get jobtype properties" + e.getMessage());

diff --git a/src/java/azkaban/webapp/AzkabanWebServer.java b/src/java/azkaban/webapp/AzkabanWebServer.java
index c86204f..d22cc5e 100644
--- a/src/java/azkaban/webapp/AzkabanWebServer.java
+++ b/src/java/azkaban/webapp/AzkabanWebServer.java
@@ -114,6 +114,7 @@ public class AzkabanWebServer implements AzkabanServer {
 	public static final String JDO_PROPERTIES_FILE = "jdo.properties";
 
 	private static final int MAX_FORM_CONTENT_SIZE = 10*1024*1024;
+	private static final int MAX_HEADER_BUFFER_SIZE = 10*1024*1024;
 	private static AzkabanWebServer app;
 
 	private static final String DEFAULT_TIMEZONE_ID = "default.timezone.id";
@@ -420,6 +421,7 @@ public class AzkabanWebServer implements AzkabanServer {
 		secureConnector.setKeyPassword(azkabanSettings.getString("jetty.keypassword"));
 		secureConnector.setTruststore(azkabanSettings.getString("jetty.truststore"));
 		secureConnector.setTrustPassword(azkabanSettings.getString("jetty.trustpassword"));
+		secureConnector.setHeaderBufferSize(MAX_HEADER_BUFFER_SIZE);
 		
 		server.addConnector(secureConnector);
 		app = new AzkabanWebServer(server, azkabanSettings);

diff --git a/src/sql/update_2.0_to_2.01.sql b/src/sql/update_2.0_to_2.01.sql
index 736f281..e5c58d4 100644
--- a/src/sql/update_2.0_to_2.01.sql
+++ b/src/sql/update_2.0_to_2.01.sql
@@ -7,7 +7,7 @@ ALTER TABLE execution_jobs ADD PRIMARY KEY(exec_id, job_id, attempt);
 ALTER TABLE execution_jobs ADD INDEX exec_job (exec_id, job_id);
 
 ALTER TABLE execution_logs ADD COLUMN attempt INT DEFAULT 0;
-ALTER TABLE execution_logs ADD COLUMN upload_time BIGINT DEFAULT 1364801450000;
+ALTER TABLE execution_logs ADD COLUMN upload_time BIGINT DEFAULT 1363634989854;
 ALTER TABLE execution_logs DROP PRIMARY KEY;
 ALTER TABLE execution_logs ADD PRIMARY KEY(exec_id, name, attempt, start_byte);