pull in countries from marketplace-constants (bug 1060689)
Merge pull request #2529 from andymckay/1060689

use marketplace-constants for countries