Fix regression in account merge w/ Aspen upgrade

We do an internal redirect as part of account merge, and we didn't
update the filename of confirm.html.spt when we upgraded to Aspen 0.25
(#888).