Remove client unittest dependency on NamedTuple
Merge branch 'jenkins-namedtuple' into 2.5-testing