Controversial industrial HQ back for vote, despite unresolved wetlands deal