Rebased code and resolved conflicts

Signed-off-by: VinashakAnkitAman <ankit.aman@radisys.com>

.github/workflows/dp-workflow.yml

@@ -6,7 +6,7 @@ on:  # yamllint disable-line rule:truthy
     branches:
       - master
       - 'v1.*'
-  pull_request:
+  pull_request_target:
     branches:
       - master
       - 'v1.*'

.github/workflows/reviewdog-workflow.yml

@@ -130,6 +130,8 @@ jobs:
           filter_mode: added
           reporter: github-pr-review
           locale: "US"
+          exclude: |
+            nms/yarn.lock
 
   mypy:
     needs: files_changed

docs/docusaurus/versioned_docs/version-1.1.X/lte/dev_notes.md

@@ -135,7 +135,7 @@ as follows:
 From within the gdb shell, `bt` command will display the backtrace for the
 segmentation fault.
 
-TODO: add steps to read coredumps from python services
+<!-- TODO: add steps to read coredumps from python services -->
 
 ### Running MME with gdb
 If you need to debug MME with gdb, make sure all the services that it is

docs/docusaurus/versioned_docs/version-1.1.X/lte/s1ap_tests.md

@@ -8,7 +8,7 @@ original_id: s1ap_tests
 Current testing workflow for VM-only S1AP integration tests. We cover
 gateway-only tests and some general notes.
 
-TODO: Update this document once integration tests with cloud are also supported
+<!-- TODO: Update this document once integration tests with cloud are also supported -->
 
 Our VM-only tests use 3 Vagrant-managed VMs hosted on the local device (laptop):
 

docs/docusaurus/versioned_docs/version-1.2.X/lte/dev_notes.md

@@ -135,7 +135,7 @@ as follows:
 From within the gdb shell, `bt` command will display the backtrace for the
 segmentation fault.
 
-TODO: add steps to read coredumps from python services
+<!-- TODO: add steps to read coredumps from python services -->
 
 ### Running MME with gdb
 If you need to debug MME with gdb, make sure all the services that it is

docs/docusaurus/versioned_docs/version-1.4.X/lte/dev_notes.md

@@ -161,7 +161,7 @@ as follows:
 From within the gdb shell, `bt` command will display the backtrace for the
 segmentation fault.
 
-TODO: add steps to read coredumps from python services
+<!-- TODO: add steps to read coredumps from python services -->
 
 ### Running MME with gdb
 If you need to debug MME with gdb, make sure all the services that it is

docs/docusaurus/versioned_docs/version-1.5.X/lte/dev_notes.md

@@ -163,7 +163,7 @@ as follows:
 From within the gdb shell, `bt` command will display the backtrace for the
 segmentation fault.
 
-TODO: add steps to read coredumps from python services
+<!-- TODO: add steps to read coredumps from python services -->
 
 ### Running MME with gdb
 If you need to debug MME with gdb, make sure all the services that it is

docs/docusaurus/versioned_docs/version-1.6.X/lte/dev_notes.md

@@ -196,7 +196,7 @@ as follows:
 From within the gdb shell, `bt` command will display the backtrace for the
 segmentation fault.
 
-TODO: add steps to read coredumps from python services
+<!-- TODO: add steps to read coredumps from python services -->
 
 ### Running MME with gdb
 If you need to debug MME with gdb, make sure all the services that it is

docs/docusaurus/versioned_docs/version-1.6.X/lte/s1ap_tests.md

@@ -15,7 +15,7 @@ subscriber, APN, policy rules, etc.). If an Orc8r is connected, these configurat
 would be overwritten periodically and also lead to restart of services, both of which will
 interfere with the test scenario.
 
-TODO: Update this document once integration tests with cloud are also supported
+<!-- TODO: Update this document once integration tests with cloud are also supported -->
 
 Our VM-only tests use 3 Vagrant-managed VMs hosted on the local device (laptop):
 

docs/docusaurus/versioned_docs/version-1.7.0/lte/dev_notes.md

@@ -216,7 +216,7 @@ as follows:
 From within the gdb shell, `bt` command will display the backtrace for the
 segmentation fault.
 
-TODO: add steps to read coredumps from python services
+<!-- TODO: add steps to read coredumps from python services -->
 
 ### Running MME with gdb
 

docs/docusaurus/versioned_docs/version-1.7.0/lte/s1ap_tests.md

@@ -16,7 +16,7 @@ subscriber, APN, policy rules, etc.). If an Orc8r is connected, these configurat
 would be overwritten periodically and also lead to restart of services, both of which will
 interfere with the test scenario.
 
-TODO: Update this document once integration tests with cloud are also supported
+<!-- TODO: Update this document once integration tests with cloud are also supported -->
 
 Our VM-only tests use 3 Vagrant-managed VMs hosted on the local device (laptop):
 

docs/readmes/lte/dev_notes.md

@@ -215,7 +215,7 @@ as follows:
 From within the gdb shell, `bt` command will display the backtrace for the
 segmentation fault.
 
-TODO: add steps to read coredumps from python services
+<!-- TODO: add steps to read coredumps from python services -->
 
 ### Running MME with gdb
 

docs/readmes/lte/s1ap_tests.md

@@ -15,7 +15,7 @@ subscriber, APN, policy rules, etc.). If an Orc8r is connected, these configurat
 would be overwritten periodically and also lead to restart of services, both of which will
 interfere with the test scenario.
 
-TODO: Update this document once integration tests with cloud are also supported
+<!-- TODO: Update this document once integration tests with cloud are also supported -->
 
 Our VM-only tests use 3 Vagrant-managed VMs hosted on the local device (laptop):
 

orc8r/gateway/python/setup.py

@@ -73,7 +73,7 @@
         'protobuf==3.19.0',
         'Jinja2>=2.8',
         'netifaces>=0.10.4',
-        'pylint>=1.7.1,<=2.14.0',
+        'pylint==2.14.0',
         'PyYAML>=3.12',
         'pytz>=2014.4',
         'prometheus_client==0.3.1',