Revert "Backport some obvious fixes for the core from Bacula 7."

This reverts commit 56560ce54e594c6bdd33c6f0fcc6210a96d6811c.