Re-land mock esr patches from bugs 813613, 825959, and 825630 now that chemspill releases have shipped.