move from brooklyn.location.basic.jclouds to brooklyn.location.jclouds, and move resolver across too