Re-sync with latest develop merge (minor conflics solved)

	ACKNOWLEDGEMENT:
 	1. This commit was developed at Vicomtech (https://www.vicomtech.org) under UE project CDN-X-ALL: "CDN edge-cloud computing for efficient cache and reliable streaming aCROSS Aggregated unicast-multicast LinkS"
 	2. Project funded by Fed4FIRE+ OC5 (https://www.fed4fire.eu)
Signed-off-by: Javier Morgade <javier.morgade@ieee.org>

openair2/UTIL/OPT/README.txt

 
+
 How to configure wireshark for dissecting LTE protocols:
 - start the wireshark as a sudoers
   - goto analyze->enabled prototols