Merge branch 'master' of xmeng@git.dyninst.org:/pub/dyninst into DataflowAPI-Liveness

Merge branch 'master' of xmeng@git.dyninst.org:/pub/dyninst into DataflowAPI-Liveness

Conflicts:
	dataflowAPI/h/ABI.h
	dataflowAPI/h/InstructionCache.h
	dataflowAPI/h/liveness.h
	dataflowAPI/src/ABI.C
	dataflowAPI/src/InstructionCache.h
	dataflowAPI/src/liveness.C
	dyninstAPI/src/BPatch_binaryEdit.C
	dyninstAPI/src/InstructionCache.h
	dyninstAPI/src/RegisterConversion-x86.C
	dyninstAPI/src/Relocation/CodeMover.C
	dyninstAPI/src/Relocation/patchapi_debug.h
	dyninstAPI/src/bitArray.C
	dyninstAPI/src/emit-x86.C
	dyninstAPI/src/instPoint.C
	dyninstAPI/src/registerSpace.C
	parseAPI/h/CFG.h
	parseAPI/make.module.tmpl
	testsuite/ppc64_bgq/symtab_group_test_group.c