MAESTRO-2968 Updates for updated Rake and Shell gem