Nuclear quadrupole moment of nitrogen from combined fully numerical and discrete basis-set calculations on NO+ and N2