Merge "Revert "Rename local RC file config variable in Supplicant servi...""