Eliminated thread local and anonymous inner classe for returning local URLs and instead just convert the bundle URL to a local URL at the point of return, if necessary. (FELIX-2645)