Map Fixes

Corrects a merge conflict.
Makes it possible for the CE to unbolt the engine core hatches.
Merge pull request #7019 from PsiOmegaDelta/MapFix

Map Fixes
Merge branch 'dev' into borg_latejoin