Make all mount points relative to the ephemeral storage, to avoid depending on bind mounts which may not yet be in place.
Merge remote-tracking branch 'origin/master'