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.
Fix storage allocation bug in list.take function.
Update Common module default allocator to be a "minimal" version and
include the allocator in the library only when built with the default.
Add as_basename() because system basename() will modify input string on mac (which causes a crash for string constants).
The input path is guaranteed not to be modified with as_basename().
Update arraylist and the test for hashmap to use "as_string_new_strdup()" to create strings, which properly goes through "cf_strdup()".
Update the Common module to be built in either one of two ways:

   1). The default way, which builds into the library the truly-minimal "default" memory allocator.
        (This mode is used by the C client.)

   2). Using the "enhanced" memory allocator from the server as a replacement for the default allocator.
        (This mode is used by the server.)  This mode is enabled when the "CF" directory and additional
        external CFLAGS are passed on the "make" command line (e.g., "-DENHANCED_ALLOC -DMEM_COUNT".)
	In this case, the Common library will have a stub "cf_alloc.o", which exports no symbols, and
        the CF library will provide the allocation-related functions.
Add cf_queue.c cf_queue_priority.c
Declare more queue functions that are needed by server.
Add -D_DARWIN_UNLIMITED_SELECT to mac compile.
Cleanup flag definitions in Makefile.
Make compiler/linker flags consistent with other modules.