Update UKMO/dev_r5107_eorca025_closea branch to rev 5518 of trunk (= branching point of NEMO 3.6_stable).