Fixes for /usr images

Depends on https://github.com/coreos/bootengine/pull/29