CB-7423 encode path before attempting to resolve
Merge remote-tracking branch 'eymorale/CB-7423'