Propagate updates from recent fcrepo4 changes in:
  https://www.pivotaltracker.com/story/show/72351918

Resolves: https://www.pivotaltracker.com/story/show/76740082
Fixed merging conflict for rebase.
Persist jcr/xml in hierarchy structure.
Corrected coding styles as suggested and fixed the bug for the hierarchy
path.