Follow coreos/init PRs

- https://github.com/coreos/init/pull/94
- https://github.com/coreos/init/pull/95