Move bug25865 to stable.
Remove vestiges of uri_auth_used.
Merge bug25865