1. add cities for Time zone picker
2. fix related tests
merge master into current branch
Dev green, solve merge conflicts
Merge branch 'master' into Issue2248
[2248] add city names to Timezone Picker

fixes #2248