ISPN 2705 + 2706 Minor CLI fixes

https://issues.jboss.org/browse/ISPN-2705
https://issues.jboss.org/browse/ISPN-2706