Second pass on xml fix.
Fired alerts were causing a funny failure.
Restored Splunk 4 support.
Revised fix based on dfoster's comments.
Merge branch 'fross/xmlfix' into develop