Merge support for MEGHDF5
Also includes additional support for the CTF classes which are in NAF
This will create a new commit in order to revert the existing changes.
