Merge "Use generic user for both zuul v2 and v3"
tree: a78e97562fc64c6020c8c57bd49188693cced931
  1. ceilometer/