Track the committed state on tokens.

Fixed container references.
Merge pull request #359 from huwshimi/track-token-state

As part of some broader work to have the machine view correctly show the state for the tokens this branch tracks and sets the committed state of the machine/container tokens.

QA: There are no visual/functionality changes in this branch.