Merge singhbalwinder/atm/v2compset' (PR #2789)

Implements remaining changes for gustiness feature for EAMv2

Remerged following an update to fix NFBF due to changes in camsrfexch.F90

[BFB]

components/cam/src/control/camsrfexch.F90

@@ -472,8 +472,8 @@ subroutine cam_export(state,cam_out,pbuf)
       cam_out%tbot(i)  = state%t(i,pver)
       cam_out%thbot(i) = state%t(i,pver) * state%exner(i,pver)
       cam_out%zbot(i)  = state%zm(i,pver)
-      cam_out%ubot(i)  = state%u(i,pver) * (vmag_gust(i)+vmag(i))/vmag(i)
-      cam_out%vbot(i)  = state%v(i,pver) * (vmag_gust(i)+vmag(i))/vmag(i)
+      cam_out%ubot(i)  = state%u(i,pver) * ((vmag_gust(i)+vmag(i))/vmag(i))
+      cam_out%vbot(i)  = state%v(i,pver) * ((vmag_gust(i)+vmag(i))/vmag(i))
       cam_out%pbot(i)  = state%pmid(i,pver)
       cam_out%rho(i)   = cam_out%pbot(i)/(rair*cam_out%tbot(i))
       psm1(i,lchnk)    = state%ps(i)