Merge "Fix a bug in ZoneCompactor that meant the zonetab offset was wrong."