update MOM6 code to make EMC code on the same page as GFDL

[jiandewang]

Description

This is a placeholder for the upcoming GFDL's MOM6 code main branch updating (https://github.com/NOAA-GFDL/MOM6/pull/1358).
It was noticed that the codes between EMC dev/emc and GFDL main branch contain some minor difference due to a mistakenly clicking of button by GFDL on 20210308's updating. A hot fixing will bring two sides' code on the same page again.

Details will be added here after the finalization of GFDL's main branch updating.
updating: GFDL updated their MOM6 main branch on 20210402, so EMC will need to make corresponding updating.

Solution
Merge GFDL's 20210402 commit to EMC MOM6 repository, test in UFS and update MOM6 and ufs-weather-model upon success. No answer change is expected and there is no any input file change.

Related to

• related MOM6 issue (update MOM6 code from GFDL (20210402) NOAA-EMC/MOM6#64)