Bug 838717 - Import main.js before accessing Weave; r=rnewman
Merge m-c to s-c.
Bug 838227 - Be more intelligent about activating constant-only providers. r=rnewman

This fixes a horrible bug that was preventing FHR from submitting data
for constant-only providers.
Merge m-c to s-c.