Merge "Fix NotImplementedError in dbcounter on SQLA 2.x"