merge

* contrib/hbct/token1.c
  * contrib/hbpgsql/rddcopy.c
    * removed unused assignment