OAK-1202: Retry Persisted merge
- add test, currently ignored.

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