We're going around in circles trying to fix the sed expressions and making one case
work and others not work. This patch fixes the base configuration file so we have
non-overlapping substitutions. I've tried to significantly clean up various problems
that were occurring once and for all.
This will hopefully resolve all the issues people have been seeing with incorrect perl
paths.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
