Refactor kmd properties to make easier Json Java parsing

Change-Id: Id3979df444006f3df022c1aaa879ddeb3d27ef22