Fix #2559: Make equivalencies work correctly with compose.
Add another compose-to-equivalencies example.
Fix tests
Merge pull request #2559 from mdboom/unit/fix-compose

Unit compose and equivalencies