Fix ZEN-13347: merge per-metric tags with overall query-level tags.
Make changes requested in code review.
Merge pull request #90 from zenoss/bug/ZEN-13347

Fix ZEN-13347: merge per-metric tags with overall query-level tags.