[added] City maintenance discount is now configurable as a percentage

Change-Id: I1e25203465065bd4617bb973fd04d3adccd867e7
Merge "[added] City maintenance discount is now configurable as a percentage" into unstable