Merge "add missing aodh class for large setups"