Make service doc ID a struct

Add support for composite doc id key in the services collection.
update unit upgrade-step and tests
unexport state.newServiceDocID()