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

* 'bp1read' of https://github.com/williamfgc/adios2:
  Support PutDeferred() in ADIOS1 writer (#21)

bug1: when writing value characteristic bpdump requires the length before the value
bug2: fixed merging serialized collective metadata index

examples/hello/bpTimeWriter/helloBPWriteStep.cpp

examples/hello/bpWriter/hellBPPutDeferred.cpp

BPWrite_c -> ctypes
XMLConfigTest.TwoIOs -> Test BP Writer 1

Callback Signature classes extend Operator
Operators can be used per Variable, IO or Engine

Continue refactoring IO, ADIOS classes

Changed m_Transports from vector to map, needed by subfile manager

Fix python module path

BP3 Deserialization:
Getting subfile seeks and intersection info
Set host language in bindings for row-major and zero-index info

Detect build image and pick dashboard script based on that

Passed ctest (MPI and nonMPI) excluding ADIOS1 engine, and Python bindings
HDF5, C bindings and C++ tests working
Introduced BeginStep EndStep functions
Renamed IO GetVariable/Attribute to InquireVariable/Attribute

Fix zmq cmake config

Use a 2-pass approach to generate ADIOS2.config.  The first pass
generates the configurable options in the header and the second pass
configures them.  This allows for consistency in the options used and
thier ordering with respect to where they're used elsewhere.

Fixes #279

added VDS support via Engine (HDF5Mixer)

Getting and defining available Variables at Open
Storing Variable position in Metadata, added to VariableBase
mpidummy: Added support for MPI_Reduce, MPI_Gatherv
Added utils and BPLS

Implemented basic buffer reading functionality
Added threading for bp serialization/deserialization
Refactored MPI functionality
Engine is now a reference
Initial Read API

added Read() to Transport class

Add upstream FindMPI