Merge "Add metadata for X.509 auth between Ceilometer and RMQ"