[[ Bug 10975 ]] Changed MCS_resolvepath() for MCS_get_canonical_path() when resolving path for cache search.
Merge branch 'bugfix-10974-10975-10976' into release-6.1.0