merge darshan-florin-extensions branch to trunk (epoch support)
The darshan-florin-extensions branch contains work done by Florin Isaila to add epochs to Darshan (ability to explicitly enable and disable periods of Darshan instrumentation and report them separately).