OAK-1657 - expand FT conditions only in absence of FT expressions

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