Merge branch 'aws-integration-merge-estepamo' into 'master'
Original MR: !443 (merged)
Merge fix where search service fails when data partition id in kind contains a hyphen.
Edited by David Diederich
Original MR: !443 (merged)
Merge fix where search service fails when data partition id in kind contains a hyphen.