Merge branch 'master' into basejobv3

Conflicts:
	regress/tests/speed-test

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

diff --cc bacula/src/cats/sql_cmds.c
Simple merge

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

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

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