Improved keep running routines for etcd/controller

Check if the containers are alive and whether the images have
changed. If so (re)start them.