SLING-3863 - correcting behavior where optional methods and constructor parameters were injected with non-null wrapper classes.

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1619212 13f79535-47bb-0310-9956-ffa450edef68