Merge packet-ng

Conflicts:
	contrib/libvbucket/cJSON.c
	contrib/libvbucket/vbucket.c
	include/libcouchbase/compat.h
	include/libcouchbase/types.h
	include/libvbucket/vbucket.h
	man/bsd/man3/lcb_cntl.3
	man/bsd/man3/lcb_create.3
	man/bsd/man3/lcb_strerror.3
	man/bsd/man3/libcouchbase.3
	man/man3couchbase/lcb_cntl.3couchbase.txt
	man/man3couchbase/lcb_create.3couchbase.txt
	man/man3couchbase/lcb_strerror.3couchbase.txt
	man/man3lib/libcouchbase.3lib.txt
	man/svr4/man3couchbase/lcb_cntl.3couchbase
	man/svr4/man3couchbase/lcb_create.3couchbase
	man/svr4/man3couchbase/lcb_strerror.3couchbase
	man/svr4/man3lib/libcouchbase.3lib
	src/arithmetic.c
	src/bconf_provider.c
	src/compat.c
	src/connect.c
	src/connection_utils.c
	src/flush.c
	src/get.c
	src/http_parse.c
	src/packet.c
	src/remove.c
	src/server.c
	src/server_io.c
	src/server_parse.c
	src/stats.c
	src/store.c
	src/touch.c
	src/verbosity.c

Change-Id: I24862d2c0bb7e6df701089b0ca9810c9a29f635b
Reviewed-on: http://review.couchbase.org/38540
Tested-by: Mark Nunberg <mnunberg@haskalah.org>
Reviewed-by: Brett Lawson <brett19@gmail.com>