Updated query normalization to avoid trampling user object.

Change-Id: I0648f3ed24062df1cf4aff0cfcbf2628804b441f
Reviewed-on: http://review.couchbase.org/31826
Tested-by: Brett Lawson <brett19@gmail.com>
Reviewed-by: Mark Nunberg <mnunberg@haskalah.org>