Fix broken return terms handling

This problem was introduced in the previous hotfix for mixed cluster
queries.  Queries not specifying the return_terms parameter were
failing.
Merge pull request #772 from basho/bugfix/2i-return-terms-arg

Fix broken return terms handling