Merge "oof changes for the new sdnr-configdb changes"