Socket Adapter: Support passing plain strings

Support passing plain strings for queries for the socket adapter. This
avoids having to use workarounds for situations such as additional
queries
Merge remote-tracking branch 'origin/new_templates'