merge asterix_opentype r340:341, minor changes for file headers

git-svn-id: https://asterixdb.googlecode.com/svn/branches/asterix_opentype_mergeback_staging@342 eaa15691-b419-025a-1212-ee371bd00084
diff --git a/asterix-app/src/test/resources/logging.properties b/asterix-app/src/test/resources/logging.properties
index 4cf5545..deb88307 100644
--- a/asterix-app/src/test/resources/logging.properties
+++ b/asterix-app/src/test/resources/logging.properties
@@ -61,5 +61,5 @@
 # messages:
 
 #edu.uci.ics.asterix.level = FINE
-edu.uci.ics.algebricks.level = FINE
-edu.uci.ics.hyracks.level = INFO
+#edu.uci.ics.algebricks.level = FINE
+#edu.uci.ics.hyracks.level = INFO