Merge "Database: Remove use of strencode() in replaceVars()"