[BUGFIX release] Ensure Engine Routes are deactivated before destruction

[trentmwillis]

Makes tests fail to reproduce #14234.

Causes some existing tests to fail, though I can add a totally separate tests for this if needed.

[rwjblue]

Awesome, thank you!

I can add a totally separate tests for this if needed

That would be great if you don't mind. If nothing more it helps us ensure that our tests document the regression, and help ensure we don't accidentally "remove that errant set in deactivate" in the future.

[trentmwillis]

@rwjblue updated. A bit more clear as to what is being tested now 😄

[rwjblue]

Awesome! We should probably add some general purpose lifecycle ordering tests too at some point, but this is perfect to help track down the regression (and prevent it happening again in the future).

[homu]

☔ The latest upstream changes (presumably #14244) made this pull request unmergeable. Please resolve the merge conflicts.

[trentmwillis]

@rwjblue updated with a fix. Tests passing except Sauce, which seems to have failed to connect properly.

What should I tag this as? BUGFIX release?

[rwjblue]

@trentmwillis - Yep, [BUGFIX release] sounds correct to me.

[trentmwillis]

Tests are passing. Pushing the amended commit message.

[rwjblue]

This has been cherry picked into beta and release branches. Please test those channels (once Travis has pushed the builds up) to confirm before final release...