Merge changes If009c2e0,Ib2097456,I032efd2d

* changes:
  Remove hashcode() override for Connection
  Handle the case of disconnecting -> active for PTS
  Cleanup state while transitioning to disconnected.