Reivse deprecated options in X-Fleet

https://github.com/coreos/fleet/pull/621/files
Merge branch 'refs/heads/fleet-v0.8.0'