AWS Gradle plugins improvements

General improvements in the code base.