OAK-2296 - Update sql2.txt test to account for name property presence in non test nodes

Merging 1644397,1644398


git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/branches/1.0@1644544 13f79535-47bb-0310-9956-ffa450edef68