SERVER-12092 mongorestore should generate valid "create" command obj

Fixes an issue where fields in the "create" command object generated
by mongorestore could be out of order, such that an invalid command
would be run instead of "create".

Conflicts:

	src/mongo/tools/restore.cpp
SERVER-12092 Fix mongorestore warning that collection options changed

Variable "obj" being shadowed by declaration in containing scope.

Conflicts:

	src/mongo/tools/restore.cpp
Merge remote-tracking branch 'upstream/v2.4' into v2.4