SERVER-14671 change class hash to struct hash, to match system include's definition
Merge remote-tracking branch 'upstream/master'