Fixed monitoring templates, adjusted template names, and re-exported XML.
Merge pull request #56 from zenoss/feature/ZEN-14104

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