Merge branch 'master' into basejobv3

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

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

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

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

diff --cc bacula/src/cats/sql_update.c
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/ua_purge.c
Simple merge