BS-9367 : CLONE - [6.1.2] And Join Gateways going into failed state

- Revert modification