CB-7423 encode path before attempting to resolve
CB-7375: Fix the filesystem name in resolveLocalFileSystemUri
Merge remote-tracking branch 'eymorale/CB-7423'
CB-7272: Replace confusing "r/o" abbreviation with just "r"