Merge pull request #2622 from kaben/prometheus

Revise images controller for better compatibility with current Dragonfly.