* Issue #4799 fixed. Generator for KeyCompareWithValue is extracted. * format fix
Change-Id: I27986e8aaf2f672145af9beae6ab659b272c9721