core module changes to restrict auto create terms in city and state

Signed-off-by: BhanuPrakashRyaga <bhanu.555prakash@gmail.com>