[BB-5972] Fix multiple issues with AWS cluster scripts
Description
This is the companion MR for Grove MR#45.
IMPORTANT Please bump grove commit ref to main and address this TODO before merge
This is the companion MR for Grove MR#45.
IMPORTANT Please bump grove commit ref to main and address this TODO before merge