MAESTRO-2969 Updates for updated Rake and Shell gem