DATAJPA-473 - Fixed bug in binding detection in String queries.

Query parameter binding replacements were undone if a simple binding was contained in the query. Fixed that and also make sure we don't create superfluous multiple bindings for the same variable and binding type.