hdf5_der

[svn-r28092] Description:
    Merge the storage message back into the layout message.

Tested on:
    MacOSX/64 10.10.5 (amazon) w/serial & parallel
    (h5committest not required on this branch)