hnbgw: osmo-hnbgw.cfg: reduce X31 to 5s

Set X31 to 5s as expected by the testsuite. The config files changed
here are not used by jenkins, but are used for manual testing by some
developers.

Previous patch ee4ce863 ("hnbgw: Introduce mp_hnbgw_timer_x31") already
sets the timer in one of the configs, move it to the end and add the
comment to make it consistent here and with the configs in
docker-playground.

Related: docker-playground I223d38e9ec2ca0f9f2ce2ac5311932789f328c9a
Change-Id: I1c275a1d10cfe0fe67d71e900881b0c4891af0be
diff --git a/hnbgw/osmo-hnbgw.cfg b/hnbgw/osmo-hnbgw.cfg
index edd8c21..60f0aba 100644
--- a/hnbgw/osmo-hnbgw.cfg
+++ b/hnbgw/osmo-hnbgw.cfg
@@ -49,9 +49,11 @@
   local-ip 127.0.0.1
   local-port 29169
   hnbap-allow-tmsi 1
- timer hnbgw x31 5
  # don't spam RANAP RESET messages for up to eight CN links across all tests
  timer hnbgw T4 60
+ # reduce default X31 from 15 seconds
+ # https://gerrit.osmocom.org/c/osmo-hnbgw/+/34922
+ timer hnbgw X31 5
 
 msc 0
  remote-addr msc-naught