fix /bin/sh startup check on non-default sh prompt

... as for example needed on stampede :-P
improve error message for failing shell startup
Merge branch 'devel' into fixes