Merge pull request #10535 from AntonioMA/master

Bug 885682: Allow including preference files from GAIA_DISTRIBUTION_DIR r=ochameau
(cherry picked from commit d9f163c5eb3ba97b08b1009b9b6e2b53d09ae776)