Merge "Updating xossh-candidate file"