giscanner: allow (nullable) and (optional)

Add (nullable) and (optional) as recognised annotations in the same places that
(allow-none) is allowed.  This should have been done in the previous
commits but the tests were passing because the only ill effect was that
a warning was issued.