Limit collect-metrics hook to fire only on charms that have metrics declared.
Merge pull request #1144 from tasdomas/filter-collect-metrics-hook-1.21

Limit collect-metrics hook to fire only on charms that have metrics declared.