integ-cli: fix TestImportDisplay & add FileServer Upstream-commit: 0954fb32a4a39735a5fc6e402b1659ee3ba0d1cb Component: engine