BZ-1007425 : fixed HashTable error on openJDK 7
Merge remote-tracking branch 'origin/6.0.x' into 6.0.x