Merge "Move ceilometer event pipeline to correct place" into stable/brahmaputra