Ensure aptpkg._consolidate_repo strips trailing slashes from repo_uri

This fixes #18909

Conflicts:
	salt/modules/aptpkg.py
Add python_shell=False
Merge pull request #19151 from rallytime/apache_fix

Add python_shell=False
Merge pull request #19138 from rallytime/cp-18915

Backport #18915 to 2014.1