WIP - N1QL DP4

Change-Id: I765a828efb2e5afb6674c1018596cb0ceeb23c7d
Merge branch 'master' of ssh://review.couchbase.com:29418/couchbase-net-client into n1ql-dp4

Conflicts:
	Src/Couchbase/Core/Server.cs

Change-Id: I7876265be1ef48ad91b54de504ab5f95eabf0754
Merge branch 'n1ql-dp4' of github.com:jeffrymorris/couchbase-net-client into n1ql-dp4

Conflicts:
	Src/Couchbase/N1QL/QueryClient.cs

Change-Id: Ie56520003627c1f3259f826e1873c624e54c8376