Ensure that hash directory computation is the same on both 32 and 64 bit architectures (#2596879) (Thanks to Mike Sweetser)