Ticket/master/pdb 954 fallback acceptance

I think this looks good. Should we add one more test that checks that we still hit the first db server if it comes back up?