backport of CRM-14499 - Image URL fixup #3058

https://github.com/civicrm/civicrm-core/pull/3058/files