ISPN-3087 + ISPN-3088 Mini CLI fixes

https://issues.jboss.org/browse/ISPN-3087
https://issues.jboss.org/browse/ISPN-3088