[master] portability fix and unset werror_ok fix
This is for ticket 2945. Don't use grep -q (not portable). Also use quotes around "$werror_ok" just in test just in case is unset. No changelog message as it appears it worked before but was just noisy.
Showing with 2 additions and 2 deletions