Merge "prototypes: xci: user-vars: Move root directory away from /opt"