SLING-3429 - fix NPE in OSGiServiceInjector which impacted multi-valued properties

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1573637 13f79535-47bb-0310-9956-ffa450edef68
SLING-3430 - only embedding necessary parts of beanutils

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