Better workaround for CLI comma-separated bug in EAP 6.0.0