CE-2062: resolve upstream conflicts, fix RouterHarness

src/api/SwaggerApi.js

src/components/IOC/IOCAsyncList/IOCAsyncList.js

src/components/IOC/IOCDetailFetcher/IOCDetailFetcher.js

src/components/IOC/IOCDetailFetcher/index.js

src/components/IOC/IOCTable/IOCDescription.js

src/components/IOC/IOCTable/IOCStatus.js

src/components/IOC/IOCTable/IOCTable.js

src/components/IOC/IOCTable/IOCTable.spec.js

src/mocks/AppHarness.js

src/mocks/fixtures/AsyncCombinedIOCs.json

src/mocks/fixtures/IOCStatus.json

src/mocks/fixtures/PagedIOCResponse.json

src/mocks/mockAPI.js

src/stories/components/common/IOC/IOCTable.stories.js

src/stories/components/common/host/HostTable.stories.js

src/stories/components/common/job/JobTable.stories.js

src/stories/utils/common-args.js