return to previous query9 api implementation
Merge branch '2.0-maint' into 2.1-maint
remove old query9 api impl
Merge branch '2.0-maint' into 2.1-maint