[8.0] Resolves errors preventing ES snapshot promotion (#123649)#123855

tylersmalley merged 3 commits intoelastic:8.0elastic/kibana:8.0from

tylersmalley:backport/8.0/pr-123649tylersmalley/kibana:backport/8.0/pr-123649Copy head branch name to clipboard