Merge "New features"
authorMartin Sunal <msunal@cisco.com>
Fri, 6 Nov 2015 19:44:58 +0000 (19:44 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Fri, 6 Nov 2015 19:44:58 +0000 (19:44 +0000)

Trivial merge