Merge "Fix double quoting issue when writing localconf"