Merge branch 'tidy-ushort-conversions' into 'ibm-trunk'

Simplify conversion of unsigned short port numbers to int (convert via char)

See merge request !71