Merge "Move sthal_cli under 2.4"