Merge "Fix ceilometer auth url"