Modified MarathonState to take two type parameters instead of one [protobuf, model]. Fixed use sites of MarathonState.mergeFromProto, incl tests.