Related to #2745. See #2745 (comment).
The TreasureMap field should differentiate between non-federated and federated maps.
This issue should be worked on post Porter (#2664 ) merge since it has the foundational changes that are needed - Porter had a similar problem that was resolved by setting a schema context.
This should be sufficient until federated / non-federated treasure maps are unified (#2737) (which entails much more significant work).