Merge socorro.external.hn.crashstorage from master