Changes for the merging of gcmt and hmtk