Merge "Rename local RC file config variable in Supplicant service makefile."