Fix #1563 : Set default CLI environment to `prod`
Merge pull request #785 from romainneutron/fix-1563

[3.8] Fix #1563 : Set default CLI environment to `prod`
Merge branch '3.8'