Fix up some sloppy non-local variables
Slurp a local.sh of overrides, if present
Fix silly quoting error in the previous service_control change