Merge branch 'master' into basejobv3

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

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

diff --cc bacula/src/dird/dird_conf.h
Simple merge

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

diff --cc bacula/src/filed/job.c
Simple merge

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

diff --cc bacula/src/findlib/find.h
Simple merge

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