Merge "Stop streaming from server when log file removed" into feature/zuulv3