Merge branch 'hotfix_mysql_charset' into upstream-4.0-stable
b: Fix foreign key assignation in job (machine_id)
Merge branch 'upstream-hotfix_job_machineforeignkey' into upstream-master