Relating the Farrell Nil-groups to the Waldhausen Nil-groups