Changing the `id` is a backward compatibility breaker. People using the ComputeService and the `TempalteBuilder.locationId()` will get errors as the location might no longer exist.

As this PR is opened against 1.7.x, could the previous ID be kept, and perhaps change it in master, if it is a must?