cli: fixed conflicts after merging https://github.com/wildfly/wildfly/pull/5912 and https://github.com/wildfly/wildfly/pull/6019