1.0: ignore trunk commits that do not need merging, remove unused import (trunk r1585949)

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