[fixed] include city tax on structure status maint time left

Change-Id: I2a12b780357baecb5be3105c4431532e5681bd01
Merge "[fixed] include city tax on structure status maint time left" into unstable