Merge "prototypes: xci: Do not require root privileges in xci-deploy"