SERVER-12383 Add upper bound for userCacheInvalidationInterval
Merge remote-tracking branch 'upstream/master'