Adjust jdbc account
Merge branch 'leon'