Refactor kmd properties to make easier Json Java parsing

Change-Id: I0e9fe1909361bb03554970d91caf163e3ba0bf57