templates: bsc/nitb: Remove explicit no force-combined-si

It's always been the default anyway, so no need to explicitly state it.
Furthermore, recently (osmobsc 167cb828665b91ed7d28007abd4a1862ebbb78c9)
force-combined-si was enabled by default for nanoBTS due to issues with
some MS not registering when it's not enabled, so let's osmo-bsc decide
were should it be enabled.

Related: OS#3063
Change-Id: I97b10406a4a0048c66a47aa7d32a113f0c0366d1

selftest/template_test.ok

@@ -77,7 +77,6 @@ network
   gprs nsvc 0 local udp port 23020
   gprs nsvc 0 remote udp port 23000
   gprs nsvc 0 remote ip val_bts.sgsn_ip_addr_bts0
-  no force-combined-si
   trx 0
    rf_locked 0
    arfcn val_trx_arfcn_trx0
@@ -148,7 +147,6 @@ network
   gprs nsvc 0 local udp port 23020
   gprs nsvc 0 remote udp port 23000
   gprs nsvc 0 remote ip val_bts.sgsn_ip_addr_bts1
-  no force-combined-si
   trx 0
    rf_locked 0
    arfcn val_trx_arfcn_trx0

src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl

@@ -85,7 +85,6 @@ network
   gprs nsvc 0 local udp port 23020
   gprs nsvc 0 remote udp port 23000
   gprs nsvc 0 remote ip ${bts.sgsn.ip_address.addr}
-  no force-combined-si
 % else:
   gprs mode none
 % endif

src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl

@@ -77,7 +77,6 @@ network
   gprs nsvc 0 local udp port 23020
   gprs nsvc 0 remote udp port 23000
   gprs nsvc 0 remote ip ${bts.sgsn.ip_address.addr}
-  no force-combined-si
 % else:
   gprs mode none
 % endif