Merge pull request #1798 from ZappoMan/master

check against NULL node from nodeWithUUID()
remove a double push on UUID in OctreeQuery
Merge pull request #1804 from birarda/master

remove a double push in OctreeQuery parsing