Fixed NULL feature type metadataId on merge ops

In Merge, Rebase, and CherryPick, the DiffTree command wasn't reporting trees, so the feature type trees would end up with a null metadata id.  This prevented the feature type from showing up in the geogit data store in geoserver.