webtop log in looses url parameters

I have attached a patch for this ticket.

Ticket https://farcry.jira.com/browse/FC-2191#icft=FC-2191 should be closed as it was fixed with FC-2360, however https://farcry.jira.com/browse/FC-2360#icft=FC-2360 causes a new problem.

Because the url is now being passed into <sec:checkedLoggedIn url="#arguments.targetPage#" /> the defaults (basically cgi.script_name?cgi.query_string) are no longer used and so you loose your url parameters.

This causes an issue in the webtop where you click on a link in the western menu pane which uses the URL.module

If the session has timed out your are redirected to the login page but you loose URL.module and then you end up with the coldfusion error:

Message The required parameter URL.module was not provided.
Exception Type Expression
Detail This page uses the cfparam tag to declare the parameter URL.module as required for this template. The parameter is not available. Ensure that you have passed or initialized the parameter correctly. To set a default value for the parameter, use the default attribute of the cfparam tag.
Tag Context
C:\Users\MJB\Documents\farcry\johntoro\core\webtop\admin\customadmin.cfm (line: 30)