hdf5_der

[svn-r27955] Merge of r27943 and 27945 from the trunk:

C++ changes

Tested on: Ubuntu 15.04 (Linux 3.19 x86_64), gcc 4.9.2
    serial C++