1. Use the children group for site.yml 2. Add some missing groups Change-Id: I01d686368b11a105a8965cf987d23772ecbf97de