Change mc16 to mc

Chen Pengrequested to merge
pengc/athena:21.6 into 21.6

Make a change of jo name and jo cvmfs path from mc16 to mc.

@ewelina , clould you please take a look this merge request?

Merge request reports