Rerise original exception on retry

Related-Prod: PRODX-14689
Change-Id: Iecefd285e180ee9946ee6548c678e9ec66173cdf
(cherry picked from commit 28bae96f56c1936ec1afac1ef0e8cd8f96541e3f)
(cherry picked from commit bbcb5111c94708c9cdaf5adb215e42852cb8e0e4)
(cherry picked from commit 5177fe65f919c3a2c5f356d52c8b02090de09186)
1 file changed