Commit new ImageManager poller and service
Fix up presentation of headstart restore targets