@trivial add missing conflict providers

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