Merge "Add functional integration test coverage for Aodh"