DATAMONGO-1072 - Fix annotated query placeholders not replaced correctly.

We now also check field names for potential placeholder matches to ensure those are registered for binding parameters.

Original pull request: #233.