Merge branch 'master' into basejobv3

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

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

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

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

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

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

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

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

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

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