This is supposed to be mostly simple cleanups and renames, but I managed to also import some brokenness from account_cards.  That may be a good thing as the problem was harder to narrow down over there.
Merge ss2 provisionally into action_events.  has same problems as that branch
Merge ss2 stuff forward