MAESTRO-2970 Update for new shell and Rakefile