add support for jdbc internal queries
Merge branch 'u/jbecla/DM-1539'