hi alex was recently asking whether https://issues.apache.org/jira/browse/OAK-2255 should be merged into the 1.0 branch.
based on a discussion wrt merging fixes into the 1.0 branch, i would like to suggest that we merge both fixes OAK-2015 and OAK-2255 into the branch. wdyt? angela
