MongoCursor::addOption() should add special $query wrapping when needed
MongoCursor::addOption() should add special $query wrapping when needed

Additionally, use this method internally when assigning options to reduce duplicated logic.

mongodb-labs/mongo-hhvm-driver-unsupported,10gen-labs/mongo-hhvm-driver,10gen-labs/mongo-hhvm-driver,110035/mongo-hhvm-driver,mongodb-labs/mongo-hhvm-driver-unsupported,110035/mongo-hhvm-driver,10gen-labs/mongo-hhvm-driver,110035/mongo-hhvm-driver,apuckey/mongo-hhvm-driver,txg168/mongo-hhvm-driver,apuckey/mongo-hhvm-driver,txg168/mongo-hhvm-driver,mongodb-labs/mongo-hhvm-driver-unsupported,apuckey/mongo-hhvm-driver,110035/mongo-hhvm-driver,txg168/mongo-hhvm-driver,apuckey/mongo-hhvm-driver