Cherry-pick: COPY FORM doesn't throw out ERROR: extra data after last expected column (7X)

Cherry-pick: COPY FORM doesn't throw out ERROR: extra data after last expected column (7X) #3730