Branch from branches/NERC/dev_r5518_NOC_MEDUSA_Stable@7709 for more debugging arising from coupled model tests.