Conflicts:
	openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
	openair2/RRC/LITE/rrc_eNB.c
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.usrpb210.conf

Merge branch 'enhancement-16-tm_rrc_reconfig' of https://gitlab.eurecom.fr/oai-internal/openairinterface5g into enhancement-16-tm_rrc_reconfig

TM2 now takes rho_a and rho_b power scaling factors into account

This tracer takes the traces ENB_MAC_UE_DL_PDU_WITH_DATA
and ENB_MAC_UE_UL_PDU_WITH_DATA from a trace file
(as generated by the "record" tracer) and sends them
in UDP packets correctly formatted for wireshark to
dissect them.

One unresolved problem I face with my version of
wireshark (1.10.6) is that I don't get the frame number,
only subframe. See in the code to change the behavior
if you use a more recent version of wireshark.

You need to properly configure wireshark for it to work.
See $OPENAIR_DIR/openair2/UTIL/OPT/README.txt.

  - fix the run_enb_ue_virt_s1 script
  - change the Ki value back to the one used

fix gnutls download (closes #122)

Please merge this fix,

Regards,

Frédéric

See merge request !38