Merge trunk changes into katcpv5 branch

git-svn-id: https://katfs.kat.ac.za/svnDS/code/katcp-python/branches/katcpv5@16419 b56c7a7d-ac47-0410-a905-b6f7de78896a