Restart conatiner with on-failure policy if exit code != 0

Signed-off-by: Michael Crosby <michael@docker.com>
Fix rebase around log event

Signed-off-by: Michael Crosby <michael@docker.com>