tree b12b28f92c1ccb799ed4fa55275f22085741fc28
parent 8508358a401b6464a3b54d4275e55a54170ccb23
parent 88e3ffe028e69ac4fb90d60a9d9ca390a0136e85
author Hector Oswaldo Caballero <hector.caballero@ericsson.com> 1530887297 -0400
committer Hector Oswaldo Caballero <hector.caballero@ericsson.com> 1530887297 -0400

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Reduce cyclomatic complexity while fixing other Sonar issues

Change-Id: I0785b57f3c5b24fa98ff00c8d0dc17abd4420070