Merge "Follow up change to GridBackupTable per V2 backup / restore (multi-db)" into ub-launcher3-master