Merge branch 'master' of https://github.com/couchbase/couchbase-net-client into ECB-changes

Conflicts:
	lib/EnyimMemcached
Merge branch 'ECB-changes' of https://github.com/rrmayer/couchbase-net-client into ECB-changes
Merge branch 'ECB-changes' of https://github.com/rrmayer/couchbase-net-client into ECB-changes