CONN-418: Fixed code to prioritize endpoints/adapter API versions for DQ...

... and RD