tree bb5ae05a988df0a8f3ca79b6c8c58a5e45b868e5
parent b567fc1f6b412d8fca8035d1cb5fecc4f4e5f6ac
author Kyle Mestery <kmestery@cisco.com> 1378716739 +0000
committer Kyle Mestery <kmestery@cisco.com> 1378716739 +0000

Augment instead of override extra ML2 options.

The existing ML2 code overwrote extra options set in localrc with
defualt values in some cases. This fixes it so it no longer does
that and instead adds to rather than overrides those values.

Fixes bug 1222854

Change-Id: Iafdaad7d4253f1b61e8a214c50adaf7599a641f2