Fix bug #10858. There were several cases where uint32 fields were mistaken

Fix bug #10858. There were several cases where uint32 fields were mistaken
for two uint16 fields and three fields were merged into one as an unknown.
There was also an unnecessary unknown field on the end that caused a
malformed packet exception to occur.

Tested with a capture of a rename.

Bug: 10858

Change-Id: Ibcf22270d2c34605bb47e3a9804b53746597572d
Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com>
Reviewed-on: https://code.wireshark.org/review/7837
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>