Use proper db functions (non-opal specific)
Merge branch 'master' of github.com:rhomobile/RMS-Testing