[4.2.x] Backport null adapter#19

ziggythehamster wants to merge 2 commits intolocalytics:v4.2.xlocalytics/odbc_adapter:v4.2.xfrom

art19:v4.2.x-backport-null-adapterart19/odbc_adapter:v4.2.x-backport-null-adapterCopy head branch name to clipboard