Fix market data snapshot ID seen by batch against a user market data snapshot: don't create composite market data snapshots unnecessarily; present ID of underlying snapshot when no override data