Add Bob Eaton's latest fixes for Encoding Converters

Change-Id: I6fc9fc215c72c12dc5337c639f83aaae6ebd29ee