Merge "Set controllerType to DEFAULT when null."
authorSeshu Kumar M <seshu.kumar.m@huawei.com>
Sun, 3 Jun 2018 03:32:06 +0000 (03:32 +0000)
committerGerrit Code Review <gerrit@onap.org>
Sun, 3 Jun 2018 03:32:06 +0000 (03:32 +0000)

Trivial merge