TBD-1306: fix problems of other MapR versions.
Merge remote-tracking branch 'origin/maintenance/5.6'