[stable30] fix: misc code fixes around db sharding#48077

Altahrim merged 1 commit intostable30nextcloud/server:stable30from

backport/47852/stable30nextcloud/server:backport/47852/stable30Copy head branch name to clipboard