FMIL: Merge trunk into `2.0.x` branch for #3825.
Make `jm_create_URL_from_abs_path` not escape digits, for #3690.
Merge FMIL branch 2.0.x into trunk to get r6585, for #3690.