TBD-981 : Support for Amazon EMR (based on Hadoop 2.0) in DI part
Merge branch 'maintenance/5.6'