bug 832158 - implement IServiceProvider with a taer off r=surkov
Bug 842729 - Repair merge failures from bug 807853 in TypeOracle and MCallOptimize r=bhackett