Merge "reverting 47860"
authorLuis Gomez <ecelgp@gmail.com>
Fri, 4 Nov 2016 19:34:07 +0000 (19:34 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Fri, 4 Nov 2016 19:34:07 +0000 (19:34 +0000)

Trivial merge