post 2.5.3

Conflicts:
	src/mongo/util/version.cpp
SERVER-11024 replace master/slave conf file examples with replset

Conflicts:
	debian/mongod.conf
	rpm/mongod.conf
SERVER-8864 Include the sslSpecial build suite in smoke.py
Only ignore 'tags' in root of tree

Otherwise rsync --filter=":- .gitignore" drops .git/refs/tags
SERVER-10868 Add --temp-path parameter to smoke.py

Conflicts:
	buildscripts/smoke.py
Towards automatic generation of vcxproj files. See comments at top of the make_vcxproj.py file on how to use.
MCI-970 send data to buildlogger in larger batches
BUMP 2.5.4

Conflicts:
	src/mongo/util/version.cpp