Original MR: !443 (merged)
Merge fix where search service fails when data partition id in kind contains a hyphen.