fix code review spacing, and allow locations to define address + hostname sensors
don't use CanonicalHostname in case user has set a specific name (or ip) for a good reason;
if you need canonical, grab it when we are creating the location, or use a new (enriched) sensor
minor tidy