Merge changes
authorThanh Ha <thanh.ha@linuxfoundation.org>
Wed, 1 Nov 2017 14:47:47 +0000 (14:47 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Wed, 1 Nov 2017 14:47:47 +0000 (14:47 +0000)

Trivial merge