MAESTRO-2969 Try to use updated shell and get stderr in correct order