fix sql user notification test
Merge branch 'master' into upgrade-infrastructure