SERVER-14352: update rocks engine for other changes
Merge remote-tracking branch 'upstream/master'