Merge "Add dhcp-subnet-assignments container"