Feature/tbd 62 amazon emr2 4 0

New pull request for amazon EMR 2.4.0 feature. In the correct branch, with a better diff.