Merge "Fix flapping DockerServiceWarning alert"