Ensure aptpkg._consolidate_repo strips trailing slashes from repo_uri

This fixes #18909
Merge pull request #19135 from rallytime/bp-18915

Backport #18915 to 2014.7