Two-level D- and A-optimal main-effects designs with run sizes one and two more than a multiple of four