CLAMP-559 fall back on site defaults when no course resource display set
Moodle 2.5.0+LAE5.0.1
Merge tag 'v2.5.0-LAE5.0.1-base' into LAE_25_PACKAGE

Moodle 2.5.0+LAE5.0.1 base