Fix for r51774, r51784: set '127.0.0.1' as IP for CLI, but with explicit check for...