Merge "Fix contrail metrics collection" into stacklight