Conflicts:
	examples/hello/bpTimeWriter/CMakeLists.txt
	examples/hello/bpWriter/CMakeLists.txt
	source/adios2/engine/dataman/DataManReader.cpp
	source/adios2/engine/dataman/DataManWriter.cpp
	source/adios2/engine/dataman/DataManWriter.h
	source/adios2/toolkit/transport/file/FileDescriptor.cpp
	source/adios2/toolkit/transport/file/FileDescriptor.h
	source/adios2/toolkit/transport/file/FilePointer.cpp
	source/adios2/toolkit/transport/file/FilePointer.h
	source/adios2/toolkit/transport/file/FileStream.cpp
	source/adios2/toolkit/transport/file/FileStream.h
	source/adios2/toolkit/transportman/dataman/DataMan.cpp
	testing/adios2/bindings/C/TestBPWriteTypes.c
	testing/adios2/bindings/C/TestBPWriteTypes_nompi.c
	testing/adios2/engine/bp/TestBPWriteProfilingJSON.cpp
	testing/adios2/engine/bp/TestBPWriteRead.cpp
	testing/adios2/engine/bp/TestBPWriteReadfstream.cpp
	testing/adios2/engine/bp/TestBPWriteReadstdio.cpp
	testing/adios2/engine/hdf5/TestHDF5WriteRead.cpp
	testing/adios2/interface/TestADIOSDefineAttribute.cpp
	testing/adios2/interface/TestADIOSDefineVariable.cpp