Replace Options class with PropertyService and create PropertyService using log directory name instead of servlet context
Merge 1.9 changes into Head
Add code to initialize Options and some code clean up
Test file for query group.