Fix problems where all EXTRAPORT macros were being replaced by the EXTRAPORT1 value. (Copy and paste issue.) (cherry picked from commitfb78f82ba1) (cherry picked from commit8513c4256b) (cherry picked from commitc8880ce14a)
Fix problems where all EXTRAPORT macros were being replaced by the EXTRAPORT1 value. (Copy and paste issue.) (cherry picked from commitfb78f82ba1) (cherry picked from commit8513c4256b) (cherry picked from commitc8880ce14a)