Merge "Updated javadoc for persistRootOnly attribute."