Make it clear when a machine is a state server.
Merge pull request #473 from frankban/state-server-machine

Make it clear when a machine is a state server.

Also simplified the machine token tests.

QA:
In sandbox mode, no change should be observed.
Using a real environment, the bootstrap node should
be displayed as "0 - State service".