Corrigendum 2 makes changes to 6.1.2, 6.2.6.1, 6.2.6.2, 6.2.6.3 (and Technical Corrigendum 1) and 6.8.2.9 and to Figure 27.