SERVER-9804 add numeric code to getLastError error when primary steps down
SERVER-9796 FTSSpec::fixSpec() should not re-order _fts* fields
SERVER-5442: use journal commit instead of fsync command for config server writes
SERVER-5442: need to resetError before doing the prepare
SERVER-9283 lastHeartbeatRecv flaps between invalid and valid dates during replicaset initilization

Do not overwrite lastHeartbeatRecv with 0 value everytime HeartbeatInfo gets updated.
SERVER-9824 Retry hash table grow operation on excessive collisions

Be defensive against excessively long hash chains in a resized table in
UnorderedFastKeyTable::_grow().  Retry growing the table up to 5 times
before declaring failure (as we do when inserting into a table).  Reduce
the maximum retry count for table insertions from 10 to 5, since growing
the table by a factor of 32 (2**5) guarantees that no hash chain can be
as long as 5% (1/20, the default _maxProbeRatio) of the new table size.
SERVER-9824 Whitespace -- CRLF to newline
SERVER-9824 Add jstest
SERVER-9856 check in-progress indexes for duplicates in prepareToBuildIndex()
SERVER-9909 balancer reload idle sharded coll data, and don't abort round

Conflicts:

	src/mongo/s/grid.cpp