Merge changes Ibc78f5be,Id1a6e6d2
authorSeshu Kumar M <seshu.kumar.m@huawei.com>
Thu, 28 Sep 2017 13:14:07 +0000 (13:14 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 28 Sep 2017 13:14:07 +0000 (13:14 +0000)
* changes:
  Fix code complexity
  Use diamond operator(<>)


Trivial merge