Oilers, Bouchard agree to two-year, $7.8 million extension