state: store units inside their respective services
Making this change simplifies a lot of code - no need
to keep a separate sequence numbering system for units,
for example.
(original proposal at https://codereview.appspot.com/6247066/)
R=
CC=
https://codereview.appspot.com/6300060