This commit represents a large amount of work toward moving services to a more standard approach to storing data, and a simplification in how networks are managed.
This reflects a change in the upstream project. A number of other fixes have been made.
