Fix/bareos 25 support#204

zinntikumugai wants to merge 2 commits intobarcus:masterbarcus/bareos:masterfrom

zinntikumugai:fix/bareos_25_supportzinntikumugai/bareos:fix/bareos_25_supportCopy head branch name to clipboard