Re-add code that sets MF2_AMBUSH if MTF_AMBUSH is set, but only for binary maps Closes #958 See merge request !1937