[PDI-11306] - add mapr31 back in shim-non-api-modules (merge conflict)