CHAT-95 Pick the commit from develop branch which fixed problem compatible with Mongo 2.6.2