Merge branch 'aws-integration-merge-estepamo' into 'master'

Morris Esteparequested to merge
cherry-pick-6eb8d362 into release/0.19

Original MR: !443 (merged)

Merge fix where search service fails when data partition id in kind contains a hyphen.

Edited by David Diederich

Merge request reports