Persist jcr/xml in hierarchy structure.

https://www.pivotaltracker.com/s/projects/684825/stories/75644184
@lsitu, it is not just the name of the variable, but the logic in creating the substring that likely needs to change.
I believe the current logic is incorrect.