AE-310 - change default AWS key behavior for the wrapper scripts