SLING-2986 : Fix metadata handling

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