First minor changes
Updated Makefiles
Updated makefiles
Non-code changes
Ray's Code Changes
Reapply fix for qscan compile issues
Reapplied compile-time fix for dbms_initf
Merge branch 'master' into ray_update
Merge branch 'master' into ray_update
Ray's Memory Leak Fix

This includes changes from Ray that should fix memory leaks.