RavenDB-1166 Normal ravendb v2.5, server/client build 2609 - take 2