Merge remote-tracking branch 'origin/master' into dev-stdio
- note: darshan-stdio module updates are still needed; this merge just updates the rest of the code and resolves conflicts
- note: darshan-stdio module updates are still needed; this merge just updates the rest of the code and resolves conflicts