SLING-2986 : Remove unneeded null checks for search path, add test for property merging

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