Merge "Use underscore for Aodh and Gnocchi's container names"