1.0.4: Merged revisions 1614384 and 1614385 (OAK-2002)

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/branches/1.0@1614396 13f79535-47bb-0310-9956-ffa450edef68
OAK-2001 TarMk compaction can still cause repository growth
 - merged rev 1614405



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