Copy of branch /UKMO/dev_r5518_bdy_sponge_temp@5878 at trunk r5936 to allow merging with INGV wave coupling branch