Merge "Add CLI tests for Neutron's metering agent"