Link to force editing a locked user is wrong in new UI

In edituser.vm, the link to force edition of a locked user currently point to the user document, which is unexpected since this template is used inside a Lightbox. The correct link should be:

<a href="javascript:window.lb.lbLoadForm('$doc.getURL("inline", "$!request.getQueryString()&force=1")')">$msg.get("forcelock")</a>

Sorry to not providing a proper patch since I do not have this at hand.

By the way, I also feel that not including xwikivars.vm in this template is a potential issue, since common variable like hasAdmin could be used in the usersheet to enhance functionnality for admins, and missing to include xwikivars.vm make such chance not working in lightbox. Feel free to put this in a separate report if you agree.
And more, in ligthbox.js, the lbClose function do a redirection that is useless and not convenient, it should just do a this.lbClearData() like what is done on the cancel button of edituser.vm. Once again, you may chose to report this separatly.