Redirect on taxonomy term "List term" pages goes to core term pages

Problem/Motivation

On custom taxonomy term pages with context admin (the "List terms" option) when resetting terms to alphabetical order the user is redirected to core taxonomy term pages. This happens when actually resetting the order or when clicking the cancel link.

Proposed resolution

This should redirect the user back to the custom context admin page.

There is already a form alter function in place to alter the list terms forms. I've created a patch which alters the form cancel button to redirect back to the custom page, and added a submit handler to override the default redirect set by the taxonomy module.

Patch to follow.