More changes to deliverable definition, reflecting final Stage 2 submission.\nStart on MathML stage 3 work