CE-1942: resolve upstream conflicts

public/config.js

src/App.js

src/api/SwaggerApi.js

src/api/UserProvider.js

src/api/UserProvider.spec.js

src/components/IOC/IOCManage/IOCManage.js

src/components/auth/AccessControl/AccessControl.js

src/components/auth/TokenRenew/TokenRenew.js

src/components/auth/TokenRenew/TokenRenew.spec.js

src/components/common/Helper.js

src/components/common/User/UserIOCList.js

src/components/common/User/UserOperationList.js

src/components/common/User/UserProfile.js

src/components/common/User/index.js

src/components/common/notification/Notifications.spec.js

src/components/host/HostIcons.js

src/components/host/HostTable.js

src/components/navigation/GlobalAppBar/GlobalAppBar.js

src/components/navigation/GlobalAppBar/index.js

src/components/navigation/LoginSuggester/LoginSuggester.js