Bug 854465: Use in-XPI modules if a preference is set.
Merge pull request #890 from Mossop/bug854465

Bug 854465: Use in-XPI modules if a preference is set. r=gozala