cli fixes

Includes fixes for
https://issues.jboss.org/browse/WFLY-2051
https://issues.jboss.org/browse/WFLY-2204
https://issues.jboss.org/browse/WFLY-2023
https://issues.jboss.org/browse/WFLY-2067
https://issues.jboss.org/browse/WFLY-2209 

Thanks,
Alexey