converted RegionToTerritories to a multimap and normalized use of IdAndName
Merge pull request #1540 from jclouds/ultradns-remove-extra-types-1.6.x

remove extra types in ultradns (1.6.x)