tree bde8ac1c5818189b008e91f38e3bea652fba98fb
parent d2ce207ac0e90c3a047474cddad88048b948de76
parent bde6092071cfe40e7bd2d74f819dd07741760dca
author Hector Oswaldo Caballero <hector.caballero@ericsson.com> 1530895620 -0400
committer Hector Oswaldo Caballero <hector.caballero@ericsson.com> 1530895620 -0400

Merge branch 'stable-2.15'

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

Change-Id: I88e2c422819b1391f4df7fa238b4755cf9d4ee17