Source fixup_stuff...

...so it can pick up config variables from local.conf

Change-Id: I0991f59881f16c72789e3b0342c26a2419ba0878
Merge "Source fixup_stuff..."