Bug fixes for combined muon triggers in the new JO
A few fixes for combined muons in the trigger new JO test:
- Create separate flags for SA vs combined muons, so that the combined muons are configured correctly
- Remove a few cases of addPublicTool that are no longer necessary (since the tools are all private)
- Fix some a bit the trigger configuration so that the right collections are available for combined muons.