Merge "Move xmlstarlet and sshpass to vagrant definition"