support null default value while using the @Value annotation
(cherry picked from commit 6d10e5a)