Re #8215. Fixing NOMAD and POWGEN monitors.
Merge remote-tracking branch 'origin/feature/8215_pg3_and_nom_geometries'