THRIFT-2263 Always generate good hashCode for Java

This ensures that Thrift objects have predictable performance in
containers.  Mostly code movement and removing an unneeded option.