Updates for 1.12.1.

Change-Id: If2d28ca118b73ac96915ebada9cfc7cbb7a1518b
Reviewed-on: https://code.wireshark.org/review/4121
Reviewed-by: Gerald Combs <gerald@wireshark.org>