Fix display of selected timezone for cities with duplicated identifiers

Some of the available timezones share the same identifier.
By joining these timezones into one selectbox entry, we fix a confusing
display bug where you could select "London" but see "Edinburgh" after
saving it.

Changelog: fixed