[PDI-11306] Dev work for MapR 3.1 for 5.1/trunk

Forward port from 5.0