WFLY-1512 jboss-cli.sh throws NPE in batch mode with certain commands

Thanks,
Alexey