Penguins, O'Connor reach two-year deal to avoid arbitration