Merge proposals dependent on lp:~jamesh/ubuntu-scopes/yelp-locale-fix

lp:~jamesh/ubuntu-scopes/yelp-locale-fix has no merge proposals.