Merge "Support nested domain-config elements" am: 749501e88e
am: b549899d0b

* commit 'b549899d0b6b95032a9c75e64c9276acd85510d1':
  Support nested domain-config elements