Merge "web: add Cache-Control to static files" into feature/zuulv3