Merge "Do not override odlparent properties"
authorTony Tkacik <ttkacik@cisco.com>
Mon, 16 Feb 2015 09:22:26 +0000 (09:22 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Mon, 16 Feb 2015 09:22:26 +0000 (09:22 +0000)

Trivial merge