Modify new JO files, [skip modfiles], [skip athena]

Yiming Abulaitirequested to merge
yabulait_603891 into master

ATLMCPROD-11244

Update existing new JO files to implement comments from @ancuetog

Skipped Athena since last GIT CI and local tests after modification are good.

Cheers, Ablet

Merge request reports