Fix SelectApiVersion() when fdb 2.0.x is installed
Merge remote-tracking branch 'origin/master' into refac_tuples