Prefer 3GPP AVPs to DIAMETER base ones
Merge remote-tracking branch 'refs/remotes/origin/live-test-fixes' into live-test-fixes