- remove non query option. (Bad code, removes values).
http://work.netxforge.com/issues/330
http://work.netxforge.com/issues/369
http://work.netxforge.com/issues/372
- fix binding for IQueryService
refactoring / cleanup
- Update unit test only JUnit4. 
- Add unit test for Monitoring Adapter.