Fixed monitoring templates, adjusted template names, and re-exported XML...

Fixes ZEN-14104