Fix Bug 1037584 - Changes from #890556 breaks player unit test
Fix Bug 1038392 - Image plugin test urls are no longer reachable
Merge branch 't1037584'
Merge branch 't1038392'