Fix order of disposal for Discovery and Execution types, so that their lifetimes follow the natural pattern:
Fix order of disposal for Discovery and Execution types, so that their lifetimes follow the natural pattern:

Construct Discovery
Construct Execution
Dispose Execution
Dispose Discovery

fixie/fixie