Remove AVPs that aren't really 3GPP2 (they are 3GPP).

(The 3GPP2 Ty trace in the menagerie wrongly marks several of these AVPs
as being 3GPP2.)

Change-Id: I27963fbf8e1da51e430c609784e0c8bb4575549d
Reviewed-on: https://code.wireshark.org/review/3912
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Consolidate several 3GPP Diameter xml files into one.

Change-Id: If6ef48fbcceaf0b3a3591086015b021c6a80956b
Reviewed-on: https://code.wireshark.org/review/3911
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>