Bug 957221 - Query local mirror, then remote mirror

* Update based in V2 work
Merge pull request #2268 from jwhonce/bug/957221

Merged by openshift-bot