Fixed up MiMa build settings for master

This is different from the merge for the 2.1.x build since in 2.1.x, we want it to actually run, where we don't care on master.