Merge branch 'master' into basejobv3

diff --cc bacula/src/dird/ua_purge.c
Simple merge

diff --cc bacula/src/dird/ua_restore.c
Simple merge

diff --cc bacula/src/findlib/find_one.c
Simple merge

diff --cc bacula/src/jcr.h
Simple merge