Use '-e' for all shell scripts.
Merge bug24759
stable to default