CLI WFLY-1735 and aesh upgrade

Thanks,
Alexey