TBD-1306: Mapr 4.0.1:Error occur When I click check service button
Merge remote-tracking branch 'origin/maintenance/5.6'