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