Merge branch 'aws-fix-collab-null-pointer' into 'release/0.27'

Aws fix collab null pointer

See merge request !826 (merged)

(cherry picked from commit 4066fe89)

12b8e5cd Added a possible fix for the collaboration id NullPointerException on Re-Indexing stuff.

Co-authored-by: Derek Hudson dhudsons@amazon.com