Conflicts:
	examples/hello/datamanReader/helloDataManReader.cpp
	source/adios2/engine/dataman/DataManReader.cpp
	source/adios2/toolkit/transport/wan/WANZmq.cpp
	source/adios2/toolkit/transportman/dataman/DataMan.cpp