Merge branch 'bnxt_en-error-recovery-bug-fixes'