consumes and token migration
Merge pull request #2516 from thspeer/consumesSiStrip

Consumes migration -- Various SiStrip classes