Update Aerospike Common (master, i.e., server branch )for ASMalloc/JEMalloc Support.
Ensure each CF allocation-related function has its own source code line.
Update Aerospike Common (master (= server) branch) to use the CF
allocation-related functions and to ensure each CF allocation-related
call has its own unique source code (i.e., ".c" file) line.
Merge branch 'master' of github.com:citrusleaf/aerospike-common
Merge branch 'master' of github.com:citrusleaf/aerospike-common

Conflicts:
	src/include/aerospike/as_list.h
	src/include/aerospike/as_rec.h
	src/include/aerospike/as_stream.h
	src/main/aerospike/as_arraylist.c
	src/main/aerospike/as_arraylist_iterator.c
	src/main/aerospike/as_boolean.c
	src/main/aerospike/as_bytes.c
	src/main/aerospike/as_hashmap.c
	src/main/aerospike/as_hashmap_iterator.c
	src/main/aerospike/as_integer.c
	src/main/aerospike/as_iterator.c
	src/main/aerospike/as_linkedlist.c
	src/main/aerospike/as_linkedlist_iterator.c
	src/main/aerospike/as_list.c
	src/main/aerospike/as_logger.c
	src/main/aerospike/as_map.c
	src/main/aerospike/as_msgpack.c
	src/main/aerospike/as_nil.c
	src/main/aerospike/as_pair.c
	src/main/aerospike/as_rec.c
	src/main/aerospike/as_serializer.c
	src/main/aerospike/as_string.c
	src/main/aerospike/as_val.c
	src/test/types/types_hashmap.c
	src/test/types/types_linkedlist.c
Remove stray conflict marker.
Add default memory allocator used when "CF" is not passed in by the server build.
Port common to mac.
Use "-undefined dynamic_lookup" flag for mac.
Use "-undefined dynamic_lookup" flag conditional for mac only.
Port common test to mac.