MDL-11789 fixed regressions preventing file caching when default used; merged from MOODLE_19_STABLE
MDL-11789 fixed regressions preventing file caching when default used; merged from MOODLE_19_STABLE

dilawar/moodle