OAK-1296: Use TypePredicate instead of NodeType.isNodeType() for NodeState type checks

Avoid the broken String-to-TypePredicate equality check spotted by Angela.
The logic becomes clearer by moving the checkValidRepoAccessControlled invocation directly to checkValidPolicy().

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