Stricter location type checks for merging

IFOPT hierarchy merges should only happen for stops, not for equipment.
Merging with undefined location types now also only happens for stops,
as that is a transitional thing anyway, until all backends provide correct
location types in all cases.