Merge branches/NERC/dev_r5518_NOC_MEDUSA_Stable revisions 5711:8147, thus svn merge -r 5711:8147.
We also resolve conflicts by hand, typically relating to retaining files in the AGRIF direcories. Nothing in main OPA_SRC aor TOP_SRC code.