Issue 609: CAS OAuth Support 3.5.2 - 'service' query parameter is not being restored correctly