- Deleted ContextHierarchyAttributes and simplified code accordingly.
- Introduced overloaded buildMergedContextConfiguration() methods in
  ContextLoaderUtils in order to handle context hierarchies separately
  from conventional, non-hierarchical contexts.
- Introduced reference to the parent configuration in
  MergedContextConfiguration and WebMergedContextConfiguration.