Fixes SPOT-942 w/ different anchoring.
Merge remote-tracking branch 'origin/master'
merging lmanes' fix for the campus selection label width