[release-v2.6] Support Tempo on IBM s390x #4185

joe-elliott merged 2 commits intorelease-v2.6grafana/tempo:release-v2.6from

backport-4175-to-release-v2.6grafana/tempo:backport-4175-to-release-v2.6Copy head branch name to clipboard