SERVER-15932 Fix build break of rocks storage engine

Signed-off-by: Ramon Fernandez <ramon.fernandez@mongodb.com>
Merge remote-tracking branch 'upstream/master'