BS-9367, fix integration tests and removal of archived gateways