Modified Makefile to include partner-prefs.js file from GAIA_DISTRIBUTION_DIR if it exists
Merge pull request #10535 from AntonioMA/master

Bug 885682: Allow including preference files from GAIA_DISTRIBUTION_DIR r=ochameau