Merge branch 'bnxt_en-Error-recovery-fixes'