SERVER-13954 Add scriptingEnabled option to YAML config
(cherry picked from commit 86d6043139f01b438281dc19381bf98f663763a3)

Conflicts:
	src/mongo/db/mongod_options.cpp
SERVER-13981 MR inc collection should not be replicated

Introduced in commit 8416afb7c5724076b1231626f27f5198a5a2cce7. Prior to that,
the collection was not replicated.

(cherry picked from commit 65ca787cfe1c287641cd859a8c7cae9e6cbde7f0)
SERVER-13945 Match x.509 cluster certs per attribute
(cherry picked from commit 81967a2dce1898d1f03938f0b5c27b8a37873877)
SERVER-13976 Cloner::go() should check return value of userCreateNS

(cherry picked from commit f89e280ef9946edf1904ffb91751461554be78b9)

Conflicts:
	src/mongo/db/cloner.cpp
SERVER-13976 Cloner::go() fail fast if any collection has bad options

(cherry picked from commit 7fced83ca52d18991b2729e2e518248b9e7c7887)
SERVER-13862 Remove old package names from rpm Conflicts field

This is a small change removing the equivalent old package name
from every stable community and enterprise rpm Conflicts field

(cherry picked from commit bf66780fece7c58d2c1f636764b54e01e55ce2bc)
SERVER-13675 do not cache plans if there is a tie

(backport of 7dcbdc440a56fef19a561f513d8eddd1c2a2b27f)
SERVER-13612 Send list of allowed SSL CAs to clients

(cherry picked from commit 1be16d8968c6bf39f01c4b3e98f854571a337823)
SERVER-13587 ndeleted in system.profile documents reports 1 too few documents removed

(cherry picked from commit 6c2cfda2d60f0fda51bb389449b7defff9704b73)
SERVER-13494 Use numeric sorting for versions in the multi-version script

Signed-off-by: Matt Kangas <matt.kangas@mongodb.com>
(cherry picked from commit 8cc8ec7cd412292a8a54d2765984e8fa1319ba61)
SERVER-13993 log the decision to change sync targets

(cherry picked from commit e84c75764bd1b1b1700cb30599c6dd2aee34eba2)
 SERVER-13737 CollectionOptions parser skip size/max if non-numeric

 (backport 0a0ba030626243e3482830f485a3ecd79da1b7c8)
SERVER-13446 Add timegm Solaris implementation to third_party

(cherry picked from commit 1ec7a22e8b10833d250892e62d7e0942b1dbb9f2)

Conflicts:
	src/third_party/SConscript
SERVER-14056 Cross-DB renameCollection needs to call commitIfNeeded

Fixes regression introduced in 0abf27ae.

Before 0abf27a, renameCollection used a DBDirectClient to read objects
from the source namespace.  The call to DBClientCursor::next() would
issue a getmore after finishing each batch, which would reach a commit
point (in DBDirectClient::call()).  The port to the new collection
interface removed the use of DBDirectClient, which removed
renameCollection's commit point.

(cherry picked from commit b27a764852873f5ecdc2dde6fffc317383c032c2)

Conflicts:
    src/mongo/db/commands/rename_collection.cpp
SERVER-14073 allow planSummary string to be longer
(cherry picked from commit d4a54eddde371014a63c23a303b998880010d2bb)
SERVER-13950 fix the dependencies in rpm packaging

Signed-off-by: Benety Goh <benety@mongodb.com>
SERVER-14064 provide planSummary for slow count commands
SERVER-14092 ignore local.replset.minvalid in upgradeChecker

(cherry picked from commit 79c5492d92e661e169d852c218ec393f31337db7)
SERVER-13760 Do not call dateToISOString if date is not formatable
(cherry picked from commit 99fa4e6058a24d6c4d7fde19ce940719c5bbc210)
SERVER-10462 retry file deletes until the file is no longer being used by another process in testing on windows

(cherry picked from commit f9be10eccac4ce39ad64d84bd02916257f9a8ef6)