Merge "Bug 5270: Fix merging"
authorVina Ermagan <vermagan@cisco.com>
Mon, 8 Feb 2016 23:52:34 +0000 (23:52 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Mon, 8 Feb 2016 23:52:34 +0000 (23:52 +0000)

Trivial merge