[fixed] Mantis 4270 - City specialization can now be removed

Change-Id: Ia2dc44c3c2ba06e3e2a3d4b0caa874e33fa4b954
Merge "[fixed] Mantis 4270 - City specialization can now be removed" into unstable