Copy of branches/UKMO/dev_r5518_GO6_package@7771 to test procedures for updating with missing updates from branches/2015/nemo_v3_6_STABLE.