SLING-2985 : support more vault/content-package serialization cases: '_jcr_content', plus hierarchical '.dir' and '_jcr_content' cases

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