Merge remote-tracking branch 'remotes/origin/develop' into issue_345_l2_fapi_simulator_new

# Conflicts:
#	openair2/LAYER2/PDCP_v10.1.0/pdcp.c
#	openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
#	openair2/LAYER2/RLC/rlc.c

cmake_targets/tools/build_helper

@@ -252,7 +252,7 @@ install_usrp_uhd_driver_from_source(){
     rm -rf /tmp/uhd
     git clone https://github.com/EttusResearch/uhd.git
     cd uhd
-    git checkout tags/release_003_010_001_001
+    git checkout tags/v3.13.0.2
     mkdir -p host/build
     cd host/build
     $CMAKE ../
@@ -683,7 +683,7 @@ install_asn1c_from_source(){
     # better to use a given commit than a branch in case the branch
     # is updated and requires modifications in the source of OAI
     #git checkout velichkov_s1ap_plus_option_group
-    git checkout d3aed06bb2bec7df1b5c6d0333f8c7dfc5993372
+    git checkout 0a7524184f16e7093990a31d8d4db487a16e5782
     autoreconf -iv
     ./configure
     make -j`nproc`