Refactor kmd propreties to make easing Json Java parsing

Change-Id: I618d6df43b563a406a4a133556740b7184ca778b