storage: merge coordination and carbonara

The coordination is actually somehow Carbonara specific. We also move
the stop() call to __del__ so that's also done in production, not only
in tests.

Change-Id: I06ba868c5c3ed29a0c9bdf5994464fc87766a5a5
Merge "storage: merge coordination and carbonara"