Redirection issue in group with custom domain when a request has a sub request

This commit fixed a number of issue for us, but also created one when a redirect occurs when on a entity page. We need to carry through the master routematch if we are using it so that it holds the parameters for the entity page otherwise we will get NULL values in return. The attached patch fixes just that issue although I would like to completely rewrite this function.

Re-Rolled with new 2.0.x branch.

(Since this issue has been re-opened, I reset the Assigned field, which was set for a person who has not worked on the issue since September 9, 2021.)

Committed

Automatically closed - issue fixed for 2 weeks with no activity.