Merge "Use max function for openstack_* related metrics"