Merge "engine: Avoid using dots in job streams"