Merge branch 'unstable'

Initial drop for integration. Contains M5 deliverables.

Change-Id: I9305605f3d370d1c8a9a4c1a618d009c49ea7645
Merge branch 'unstable'

Fixes from unstable that make client API more strongly typed,
fixes to querycmd and fix that breaks when special chars appear
in data in collation.

Change-Id: I3436499488735ff4f7565ba527606ad9390df6a0
Merge branch 'unstable'

Deliver N1QL changes

Change-Id: I24f8a8a8aa55c10c594ea01191cdc082f33cccd1
Pass DEPENDS argument correctly

Change-Id: I36de185c1e430d51688292b6b714b0c87fca3076
Reviewed-on: http://review.couchbase.org/44217
Reviewed-by: Chris Hillery <ceej@couchbase.com>
Tested-by: Chris Hillery <ceej@couchbase.com>
Merge commit 'ec4087d' into unstable

Change-Id: I51759ce9b61aaef5ddfa4b29775f654f69e65cb9