CXX-216 Update Travis (Clang 3.4 and GCC 4.8)
CXX-197 Backport server r2.6.0..r2.6.1 changes