Merged master-csd and set MaxPermSize

When running the hive ql tests, I keep running out of PermGen with the default max.