what?
Merge branch 'john' of github.com:jtraver/aerospike-common into john

Conflicts:
	src/include/aerospike/as_serializer.h
	src/include/aerospike/as_string.h
	src/include/aerospike/as_timer.h
	src/include/citrusleaf/alloc.h
	src/include/citrusleaf/cf_b64.h
	src/include/citrusleaf/cf_crypto.h
	src/include/citrusleaf/cf_types.h
	src/main/aerospike/as_timer.c