TBD-1274: error occurs when check connection on Amazon EMR
Merge remote-tracking branch 'origin/maintenance/5.6'