Met monitoring update from 21.3

Kenji Hamanorequested to merge
khamano/athena:motMonUpdate_Apr2019 into master

Update the met monitoring code in master to match with 21.3.

Merge request reports