Adapt CLI scripts for current upstream WildFly9.0 configuration