Merge "Fixes"
authorVivek Srivastava <vivek.v.srivastava@ericsson.com>
Thu, 14 Jan 2016 12:51:34 +0000 (12:51 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Thu, 14 Jan 2016 12:51:34 +0000 (12:51 +0000)

Trivial merge