Baryon oscillations in galaxy and matter power-spectrum covariance matrices