Merge "Clean up local variable usage - Remainder"

lib/config

@@ -110,6 +110,7 @@ function merge_config_group {
 
     [[ -r $localfile ]] || return 0
 
+    local configfile group
     for group in $matchgroups; do
         for configfile in $(get_meta_section_files $localfile $group); do
             if [[ -d $(dirname $(eval "echo $configfile")) ]]; then

lib/tls

@@ -84,6 +84,7 @@ function create_CA_base {
         return 0
     fi
 
+    local i
     for i in certs crl newcerts private; do
         mkdir -p $ca_dir/$i
     done