SERVER-11235 honor timeout parameter
SERVER-11178: Adjust two log levels in new catalog code
SERVER-10130: add gle to update config call
BUMP 2.5.4
Merge remote-tracking branch 'upstream/master'