Merge branch 'release-2.12' of https://github.com/meteor/meteor into release-2.12

packages/accounts-base/accounts-base.d.ts

@@ -1,5 +1,6 @@
 import { Mongo } from 'meteor/mongo';
 import { Meteor } from 'meteor/meteor';
+import { Configuration } from 'meteor/service-configuration';
 
 export interface URLS {
   resetPassword: (token: string) => string;
@@ -71,6 +72,8 @@ export namespace Accounts {
     stop: () => void;
   };
 
+  var loginServiceConfiguration: Mongo.Collection<Configuration>
+
   function loginServicesConfigured(): boolean;
 
   function onPageLoadLogin(func: Function): void;