Increased jvm memory
Restored all CDH5 tests
Restored annotations.jar