- few small fixes
Merge branch 'master' of https://github.com/ornladios/ADIOS
Revert "Merge branch 'master' of https://github.com/ornladios/ADIOS"

This reverts commit ae14676ccaff335eeb45048701ea5ea4f8d74d8c, reversing
changes made to cf1e57a63cf19a1c25dba10d45054637f8b82516.