Fixed mongo so c++11 options is only used on master or 2.5 builds
Merge branch 'master' into simc