Merge "Persist parent_resource_name and make sure it's available"
tree: 1e17ffecdba58c949f6470585006a13605146a7d
  1. common/
  2. functional/
  3. scenario/