ACT-1890: Multi tenancy support: QA fix for mySQL
Merge remote-tracking branch 'upstream/master'