Revert "Change putKind ordering to kind-object-index"

:Release Notes:
Revert "Change putKind ordering to kind-object-index"

:Detailed Notes:
This reverts commit e1f949fd0d3e6c84ec0487f92c946c5512ce2008.

:QA Notes:

:Issues Addressed:

Open-webOS-DCO-1.0-Signed-off-by: Igor Kuksyuk <igor.kuksiuk@lge.com>

Change-Id: I841a38aab8d09358e98531b28619361e5a4db978
Reviewed-on: https://g2g.palm.com/4967
Reviewed-by: DCO Verification
Reviewed-by: Igor Kuksyuk <igor.kuksiuk@lge.com>
Tested-by: Igor Kuksyuk <igor.kuksiuk@lge.com>
Reviewed-by: Maksym Sditanov <maxim.sditanov@lge.com>