Reduce the amount of Swift auth cache keys used on wiki farms

Change-Id: I7cc0a9d1d72a829ca8846f2f501bcbff11bf019b
Merge "Reduce the amount of Swift auth cache keys used on wiki farms" into wmf/1.23wmf13