Merge "Escape SQL LIKE wildcards in queries (CPS-1760 #1)"