SERVER-12092 Fix mongorestore warning that collection options changed

Variable "obj" being shadowed by declaration in containing scope.
Merge remote-tracking branch 'upstream/master'